summaryrefslogtreecommitdiffstats
path: root/opengl/libs/GLES_CM/gl.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2012-01-28 21:44:00 -0800
committerMathias Agopian <mathias@google.com>2012-01-29 22:22:09 -0800
commit48d438d05f14c2f4bd83ae89f520368cd49122df (patch)
tree7a393d3a2e7ef9f6e4ed17afcd6802d59c578267 /opengl/libs/GLES_CM/gl.cpp
parent453851f3a00d198374395581275a9ae7fa7aa4bf (diff)
downloadframeworks_native-48d438d05f14c2f4bd83ae89f520368cd49122df.zip
frameworks_native-48d438d05f14c2f4bd83ae89f520368cd49122df.tar.gz
frameworks_native-48d438d05f14c2f4bd83ae89f520368cd49122df.tar.bz2
add support for GL_EXT_debug_marker
This extension is always added to the GL_EXTENSIONS extension string for the current GL context, regardless of if it's supported by the h/w driver. The extension itself will be handled by GLES_trace (eventually), when GLES_trace is not enabled, it'll result to a no-op. If the h/w implementation has this extension, we'll call that version instead of our dummy version. Change-Id: Ie5dd3387c4d45cd5ed5f03b73bda6045620a96bc
Diffstat (limited to 'opengl/libs/GLES_CM/gl.cpp')
-rw-r--r--opengl/libs/GLES_CM/gl.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/opengl/libs/GLES_CM/gl.cpp b/opengl/libs/GLES_CM/gl.cpp
index 2d31a35..adeaa5b 100644
--- a/opengl/libs/GLES_CM/gl.cpp
+++ b/opengl/libs/GLES_CM/gl.cpp
@@ -165,6 +165,20 @@ extern "C" {
#undef CALL_GL_API
#undef CALL_GL_API_RETURN
+/*
+ * glGetString() is special because we expose some extensions in the wrapper
+ */
+
+extern "C" const GLubyte * __glGetString(GLenum name);
+
+const GLubyte * glGetString(GLenum name)
+{
+ const GLubyte * ret = egl_get_string_for_current_context(name);
+ if (ret == NULL) {
+ ret = __glGetString(name);
+ }
+ return ret;
+}
/*
* These GL calls are special because they need to EGL to retrieve some