summaryrefslogtreecommitdiffstats
path: root/third_party/khronos
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 07:27:36 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 07:27:36 +0000
commitc45f197ed2d12b4f16a3d3ab05040d7c58e479b0 (patch)
tree878ca8b6aa0446992c759aa0d8d7bd5f274eea3a /third_party/khronos
parentfb11b6a4f2f8f38eb52fd4dca2bf45f09917583d (diff)
downloadchromium_src-c45f197ed2d12b4f16a3d3ab05040d7c58e479b0.zip
chromium_src-c45f197ed2d12b4f16a3d3ab05040d7c58e479b0.tar.gz
chromium_src-c45f197ed2d12b4f16a3d3ab05040d7c58e479b0.tar.bz2
Add support for GL_COMMANDS_ISSUED_CHROMIUM fence like query.
I'm not sure this is the right way to do this. I started by adding a few switch/case statements and then realized that there is no guarntee that glGenQueriesXXX exists which means I have to NOT call that for GL_COMMANDS_ISSUED_CHROMIUM queries. I ended up going down the path of a base class and this is where it lead. TEST=unit tests BUG=117768 Review URL: http://codereview.chromium.org/9694025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/khronos')
-rw-r--r--third_party/khronos/GLES2/gl2ext.h9
-rw-r--r--third_party/khronos/README.chromium1
2 files changed, 10 insertions, 0 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h
index fd39ca3..04fa4e0 100644
--- a/third_party/khronos/GLES2/gl2ext.h
+++ b/third_party/khronos/GLES2/gl2ext.h
@@ -1955,6 +1955,15 @@ typedef void (GL_APIENTRYP PFNGLTEXIMAGEIOSURFACE2DCHROMIUM) (GLenum target, GLs
#endif
#endif
+/* GL_CHROMIUM_command_buffer_query */
+/* Exposes GL_CHROMIUM_command_buffer_query.
+ */
+#ifndef GL_CHROMIUM_command_buffer_query
+#define GL_CHROMIUM_command_buffer_query 1
+// TODO(gman): Get official numbers for these constants.
+#define GL_COMMANDS_ISSUED_CHROMIUM 0x84F2
+#endif
+
#ifdef __cplusplus
}
#endif
diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium
index aa2accc..fb7daee 100644
--- a/third_party/khronos/README.chromium
+++ b/third_party/khronos/README.chromium
@@ -20,5 +20,6 @@ GLES2/gl2ext.h
- Added Chromium and Angle extensions.
- Added ANGLE_instanced_arrays
- Added GL_EXT_framebuffer_multisample
+ - Added GL_CHROMIUM_command_buffer_query
EGL/eglplatform.h
- Added EGLNative*Type for Mac.