diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-17 10:19:09 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-17 10:19:09 +0000 |
| commit | c4485aad698e143020b8177d688005d1a1705223 (patch) | |
| tree | e6fb0ddfda378597f540f5650851492e7b26b801 /third_party/khronos | |
| parent | 40b2d96a694b5dcdf9883d7296c132115670e0a9 (diff) | |
| download | chromium_src-c4485aad698e143020b8177d688005d1a1705223.zip chromium_src-c4485aad698e143020b8177d688005d1a1705223.tar.gz chromium_src-c4485aad698e143020b8177d688005d1a1705223.tar.bz2 | |
Add a command to lose the context
BUG=166020
Review URL: https://chromiumcodereview.appspot.com/11568029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/khronos')
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 9 | ||||
| -rw-r--r-- | third_party/khronos/README.chromium | 15 |
2 files changed, 17 insertions, 7 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index 35a28cb9..6cbca97 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -2173,6 +2173,15 @@ typedef void (GL_APIENTRYP PFNGLRELEASETEXIMAGE2DCHROMIUM) (GLenum target, GLint #define GL_ASYNC_PIXEL_TRANSFERS_COMPLETED_CHROMIUM 0x84F5 #endif +/* GL_CHROMIUM_lose_context */ +#ifndef GL_CHROMIUM_lose_context +#define GL_CHROMIUM_lose_context 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glLoseContextCHROMIUM (GLenum current, GLenum other); +#endif +typedef void (GL_APIENTRYP PFNGLLOSECONTEXTCHROMIUM) (GLenum current, GLenum other); +#endif + #ifdef __cplusplus } #endif diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 7760f41..36caefa 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -21,20 +21,21 @@ GLES2/gl2.h - Added include of gl2chromium.h GLES2/gl2ext.h - Added Chromium and Angle extensions. - - Added ANGLE_instanced_arrays + - Added GL_ANGLE_instanced_arrays - Added GL_ARB_robustness (subsetted) - Added GL_ARB_texture_rectangle (subsetted) - - Added GL_EXT_framebuffer_multisample - - Added GL_CHROMIUM_command_buffer_query + - Added GL_CHROMIUM_async_pixel_transfers + - Added GL_CHROMIUM_bind_uniform_location - Added GL_CHROMIUM_command_buffer_latency_query + - Added GL_CHROMIUM_command_buffer_query - Added GL_CHROMIUM_copy_texture - - Added GL_CHROMIUM_bind_uniform_location - Added GL_CHROMIUM_get_error_query + - Added GL_CHROMIUM_gpu_memory_manager - Added GL_CHROMIUM_iosurface - - Added GL_CHROMIUM_texture_from_image + - Added GL_CHROMIUM_lose_context - Added GL_CHROMIUM_pixel_transfer_buffer_object - - Added GL_CHROMIUM_async_pixel_transfers - - Added GL_CHROMIUM_gpu_memory_manager + - Added GL_CHROMIUM_texture_from_image + - Added GL_EXT_framebuffer_multisample - Added GL_NVX_gpu_memory_info - Added include of gl2chromium.h EGL/eglplatform.h |