Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5c6c5c7a: fix [3028370] GL get error should return a valid error if no context is bound.

Browse Source 
Merge commit '5c6c5c7a43d44316395f5c35ab713372124b8b4c' into gingerbread-plus-aosp

* commit '5c6c5c7a43d44316395f5c35ab713372124b8b4c':
  fix [3028370] GL get error should return a valid error if no context is bound.
This commit is contained in:
Mathias Agopian
2010-09-23 13:24:11 -07:00
committed by Android Git Automerger
parent 1fd1129264 5c6c5c7a43
commit 9c4d7d6770
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opengl/libs/EGL/egl.cpp
View File

@@ -437,6 +437,12 @@ static void gl_no_context() {
} }
} }
// Always return GL_INVALID_OPERATION from glGetError() when called from
// a thread without a bound context.
static GLenum gl_no_context_glGetError() {
return GL_INVALID_OPERATION;
}
static void early_egl_init(void) static void early_egl_init(void)
{ {
#if !USE_FAST_TLS_KEY #if !USE_FAST_TLS_KEY
@@ -447,6 +453,9 @@ static void early_egl_init(void)
(uint32_t*)(void*)&gHooksNoContext, (uint32_t*)(void*)&gHooksNoContext,
addr, addr,
sizeof(gHooksNoContext)); sizeof(gHooksNoContext));
gHooksNoContext.gl.glGetError = gl_no_context_glGetError;
setGlThreadSpecific(&gHooksNoContext); setGlThreadSpecific(&gHooksNoContext);
} }