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

am 4eb1ad5e: am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread

Browse Source 
Merge commit '4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e'

* commit '4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e':
  better fix for [3028370] GL get error should return a valid error if no context is bound.
This commit is contained in:
Mathias Agopian
2010-09-23 21:41:30 -07:00
committed by Android Git Automerger
parent 04e79051dc 4eb1ad5e98
commit 2184624db1
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -444,19 +444,14 @@ static void(*findProcAddress(const char* name,
// ----------------------------------------------------------------------------
static void gl_no_context() {
static int gl_no_context() {
tls_t* tls = getTLS();
if (tls->logCallWithNoContext == EGL_TRUE) {
tls->logCallWithNoContext = EGL_FALSE;
LOGE("call to OpenGL ES API with no current context "
"(logged once per thread)");
}
}
// 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;
return 0;
}
static void early_egl_init(void)
@@ -470,8 +465,6 @@ static void early_egl_init(void)
addr,
sizeof(gHooksNoContext));
gHooksNoContext.gl.glGetError = gl_no_context_glGetError;
setGlThreadSpecific(&gHooksNoContext);
}

1
opengl/libs/GLES2/gl2.cpp
View File

@@ -60,6 +60,7 @@ using namespace android;
"ldr r12, [r12, %[tls]] \n" \
"cmp r12, #0 \n" \
"ldrne pc, [r12, %[api]] \n" \
"mov r0, #0 \n" \
"bx lr \n" \
: \
: [tls] "J"(TLS_SLOT_OPENGL_API*4), \

1
opengl/libs/GLES_CM/gl.cpp
View File

@@ -114,6 +114,7 @@ GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type,
"ldr r12, [r12, %[tls]] \n" \
"cmp r12, #0 \n" \
"ldrne pc, [r12, %[api]] \n" \
"mov r0, #0 \n" \
"bx lr \n" \
: \
: [tls] "J"(TLS_SLOT_OPENGL_API*4), \