diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 21:07:00 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 21:07:00 +0000 |
| commit | efcdd2363d66f110d0e67fcff68e2f8f22bbf7be (patch) | |
| tree | aa93312d779f4ecd648ad5ae3fd908316c7abcfe /third_party | |
| parent | 70ec89769238adca7ae8db6df7cdd1c109b64486 (diff) | |
| download | chromium_src-efcdd2363d66f110d0e67fcff68e2f8f22bbf7be.zip chromium_src-efcdd2363d66f110d0e67fcff68e2f8f22bbf7be.tar.gz chromium_src-efcdd2363d66f110d0e67fcff68e2f8f22bbf7be.tar.bz2 | |
Add GL_CHROMIUM_get_error_query
Makes it possible to asynchronously query GL errors.
TEST=unit tests
BUG=133630
Review URL: https://chromiumcodereview.appspot.com/10577037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 9 | ||||
| -rw-r--r-- | third_party/khronos/README.chromium | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index c604c12..ee0da03 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -1985,6 +1985,15 @@ typedef void (GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUM) (GLenum target, GLenum sour #define GL_COMMANDS_ISSUED_CHROMIUM 0x84F2 #endif +/* GL_CHROMIUM_get_error_query */ +/* Exposes GL_CHROMIUM_get_error_query. + */ +#ifndef GL_CHROMIUM_get_error_query +#define GL_CHROMIUM_get_error_query 1 +// TODO(gman): Get official numbers for these constants. +#define GL_GET_ERROR_QUERY_CHROMIUM 0x84F3 +#endif + /* GL_CHROMIUM_texture_mailbox */ #ifndef GL_CHROMIUM_texture_mailbox #define GL_CHROMIUM_texture_mailbox 1 diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 1fa97c6..bbdba9c 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -23,5 +23,6 @@ GLES2/gl2ext.h - Added GL_CHROMIUM_command_buffer_query - Added GL_CHROMIUM_copy_texture - Added GL_CHROMIUM_bind_uniform_location + - Added GL_CHROMIUM_get_error_query EGL/eglplatform.h - Added EGLNative*Type for Mac. |