From 5c6c5c7a43d44316395f5c35ab713372124b8b4c Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Thu, 23 Sep 2010 11:32:52 -0700 Subject: fix [3028370] GL get error should return a valid error if no context is bound. glGetError() will now always return GL_INVALID_OPERATION if called from a thread with no GL context bound. Change-Id: I28ba458871db051bb4f5a26668a1fa123526869c --- opengl/libs/EGL/egl.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'opengl') diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 105ebb4..0437263 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -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) { #if !USE_FAST_TLS_KEY @@ -447,6 +453,9 @@ static void early_egl_init(void) (uint32_t*)(void*)&gHooksNoContext, addr, sizeof(gHooksNoContext)); + + gHooksNoContext.gl.glGetError = gl_no_context_glGetError; + setGlThreadSpecific(&gHooksNoContext); } -- cgit v1.1