diff options
| author | epenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 19:57:16 +0000 |
|---|---|---|
| committer | epenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 19:57:16 +0000 |
| commit | 69023944fd69b3cabe71f1dec7fdfa922f2034d7 (patch) | |
| tree | 44f8d73a06d55e9136af99e1c79e4a59274e7c7a /third_party/khronos | |
| parent | b949fcb52666d423b7c66d9a7a69d482bf056513 (diff) | |
| download | chromium_src-69023944fd69b3cabe71f1dec7fdfa922f2034d7.zip chromium_src-69023944fd69b3cabe71f1dec7fdfa922f2034d7.tar.gz chromium_src-69023944fd69b3cabe71f1dec7fdfa922f2034d7.tar.bz2 | |
gpu: Add async upload functions.
Just adding the API first to unblock other CLs and so
we can start to use the API. Async tasks are just
done synchronously, and the completion query is set
immediately when it executes in the GPU process.
BUG=161337
Review URL: https://chromiumcodereview.appspot.com/11412232
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/khronos')
| -rw-r--r-- | third_party/khronos/GLES2/gl2chromium.h | 2 | ||||
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 7 | ||||
| -rw-r--r-- | third_party/khronos/README.chromium | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/third_party/khronos/GLES2/gl2chromium.h b/third_party/khronos/GLES2/gl2chromium.h index 1c3517e..2ce097e 100644 --- a/third_party/khronos/GLES2/gl2chromium.h +++ b/third_party/khronos/GLES2/gl2chromium.h @@ -224,6 +224,8 @@ #define glReleaseTexImage2DCHROMIUM GLES2_GET_FUN(ReleaseTexImage2DCHROMIUM) #define glTraceBeginCHROMIUM GLES2_GET_FUN(TraceBeginCHROMIUM) #define glTraceEndCHROMIUM GLES2_GET_FUN(TraceEndCHROMIUM) +#define glAsyncTexSubImage2DCHROMIUM GLES2_GET_FUN(AsyncTexSubImage2DCHROMIUM) +#define glAsyncTexImage2DCHROMIUM GLES2_GET_FUN(AsyncTexImage2DCHROMIUM) #endif // THIRD_PARTY_KHRONOS_GLES2_GL2CHROMIUM_H_ diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index 14dda71..f1fd2c4 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -2154,6 +2154,13 @@ typedef void (GL_APIENTRYP PFNGLRELEASETEXIMAGE2DCHROMIUM) (GLenum target, GLint #define GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM 0x88EF #endif +/* GL_CHROMIUM_async_pixel_transfers */ +#ifndef GL_CHROMIUM_async_pixel_transfers +#define GL_CHROMIUM_async_pixel_transfers 1 +// TODO: Get official numbers for these constants. +#define GL_ASYNC_PIXEL_TRANSFERS_COMPLETED_CHROMIUM 0x84F5 +#endif + #ifdef __cplusplus } #endif diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 1e36778..4b6290f 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -33,6 +33,7 @@ GLES2/gl2ext.h - Added GL_CHROMIUM_iosurface - Added GL_CHROMIUM_texture_from_image - Added GL_CHROMIUM_pixel_transfer_buffer_object + - Added GL_CHROMIUM_async_pixel_transfers - Added GL_NVX_gpu_memory_info - Added include of gl2chromium.h GLES2/glchromium.h |