diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 11:38:45 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 17:16:47 +0000 |
commit | 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch) | |
tree | 43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/gpu/command_buffer/client/gles2_c_lib_autogen.h | |
parent | f61ab1ac7f855cd281809255c0aedbb1895e1823 (diff) | |
download | qtwebengine-chromium-3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859.tar.gz |
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/gpu/command_buffer/client/gles2_c_lib_autogen.h')
-rw-r--r-- | chromium/gpu/command_buffer/client/gles2_c_lib_autogen.h | 55 |
1 files changed, 49 insertions, 6 deletions
diff --git a/chromium/gpu/command_buffer/client/gles2_c_lib_autogen.h b/chromium/gpu/command_buffer/client/gles2_c_lib_autogen.h index 58881b7d77a..8e59df28865 100644 --- a/chromium/gpu/command_buffer/client/gles2_c_lib_autogen.h +++ b/chromium/gpu/command_buffer/client/gles2_c_lib_autogen.h @@ -1070,6 +1070,9 @@ void GLES2GetQueryivEXT(GLenum target, GLenum pname, GLint* params) { void GLES2GetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint* params) { gles2::GetGLContext()->GetQueryObjectuivEXT(id, pname, params); } +void GLES2GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64* params) { + gles2::GetGLContext()->GetQueryObjectui64vEXT(id, pname, params); +} void GLES2InsertEventMarkerEXT(GLsizei length, const GLchar* marker) { gles2::GetGLContext()->InsertEventMarkerEXT(length, marker); } @@ -1223,17 +1226,35 @@ void GLES2CopyTextureCHROMIUM(GLenum target, GLenum source_id, GLenum dest_id, GLint internalformat, - GLenum dest_type) { - gles2::GetGLContext()->CopyTextureCHROMIUM(target, source_id, dest_id, - internalformat, dest_type); + GLenum dest_type, + GLboolean unpack_flip_y, + GLboolean unpack_premultiply_alpha, + GLboolean unpack_unmultiply_alpha) { + gles2::GetGLContext()->CopyTextureCHROMIUM( + target, source_id, dest_id, internalformat, dest_type, unpack_flip_y, + unpack_premultiply_alpha, unpack_unmultiply_alpha); } void GLES2CopySubTextureCHROMIUM(GLenum target, GLenum source_id, GLenum dest_id, GLint xoffset, - GLint yoffset) { - gles2::GetGLContext()->CopySubTextureCHROMIUM(target, source_id, dest_id, - xoffset, yoffset); + GLint yoffset, + GLint x, + GLint y, + GLsizei width, + GLsizei height, + GLboolean unpack_flip_y, + GLboolean unpack_premultiply_alpha, + GLboolean unpack_unmultiply_alpha) { + gles2::GetGLContext()->CopySubTextureCHROMIUM( + target, source_id, dest_id, xoffset, yoffset, x, y, width, height, + unpack_flip_y, unpack_premultiply_alpha, unpack_unmultiply_alpha); +} +void GLES2CompressedCopyTextureCHROMIUM(GLenum target, + GLenum source_id, + GLenum dest_id) { + gles2::GetGLContext()->CompressedCopyTextureCHROMIUM(target, source_id, + dest_id); } void GLES2DrawArraysInstancedANGLE(GLenum mode, GLint first, @@ -1383,12 +1404,18 @@ void GLES2ScheduleOverlayPlaneCHROMIUM(GLint plane_z_order, void GLES2SwapInterval(GLint interval) { gles2::GetGLContext()->SwapInterval(interval); } +void GLES2FlushDriverCachesCHROMIUM() { + gles2::GetGLContext()->FlushDriverCachesCHROMIUM(); +} void GLES2MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat* m) { gles2::GetGLContext()->MatrixLoadfCHROMIUM(matrixMode, m); } void GLES2MatrixLoadIdentityCHROMIUM(GLenum matrixMode) { gles2::GetGLContext()->MatrixLoadIdentityCHROMIUM(matrixMode); } +GLenum GLES2GetGraphicsResetStatusKHR() { + return gles2::GetGLContext()->GetGraphicsResetStatusKHR(); +} void GLES2BlendBarrierKHR() { gles2::GetGLContext()->BlendBarrierKHR(); } @@ -2337,6 +2364,10 @@ extern const NameToFunc g_gles2_function_table[] = { reinterpret_cast<GLES2FunctionPointer>(glGetQueryObjectuivEXT), }, { + "glGetQueryObjectui64vEXT", + reinterpret_cast<GLES2FunctionPointer>(glGetQueryObjectui64vEXT), + }, + { "glInsertEventMarkerEXT", reinterpret_cast<GLES2FunctionPointer>(glInsertEventMarkerEXT), }, @@ -2480,6 +2511,10 @@ extern const NameToFunc g_gles2_function_table[] = { reinterpret_cast<GLES2FunctionPointer>(glCopySubTextureCHROMIUM), }, { + "glCompressedCopyTextureCHROMIUM", + reinterpret_cast<GLES2FunctionPointer>(glCompressedCopyTextureCHROMIUM), + }, + { "glDrawArraysInstancedANGLE", reinterpret_cast<GLES2FunctionPointer>(glDrawArraysInstancedANGLE), }, @@ -2608,6 +2643,10 @@ extern const NameToFunc g_gles2_function_table[] = { reinterpret_cast<GLES2FunctionPointer>(glSwapInterval), }, { + "glFlushDriverCachesCHROMIUM", + reinterpret_cast<GLES2FunctionPointer>(glFlushDriverCachesCHROMIUM), + }, + { "glMatrixLoadfCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(glMatrixLoadfCHROMIUM), }, @@ -2616,6 +2655,10 @@ extern const NameToFunc g_gles2_function_table[] = { reinterpret_cast<GLES2FunctionPointer>(glMatrixLoadIdentityCHROMIUM), }, { + "glGetGraphicsResetStatusKHR", + reinterpret_cast<GLES2FunctionPointer>(glGetGraphicsResetStatusKHR), + }, + { "glBlendBarrierKHR", reinterpret_cast<GLES2FunctionPointer>(glBlendBarrierKHR), }, |