commit 5c6c5c7a43d44316395f5c35ab713372124b8b4c
author Mathias Agopian <mathias@google.com> Thu Sep 23 11:32:52 2010 -0700
committer Mathias Agopian <mathias@google.com> Thu Sep 23 13:19:02 2010 -0700
tree 43ec94e3ed008616b1ddeee67aef3420180cbe1b
parent bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8

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

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 @@
     }
 }
 
+// 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 @@
             (uint32_t*)(void*)&gHooksNoContext, 
             addr, 
             sizeof(gHooksNoContext));
+
+    gHooksNoContext.gl.glGetError = gl_no_context_glGetError;
+
     setGlThreadSpecific(&gHooksNoContext);
 }