Index: ui/gl/gl_bindings_autogen_gl.cc |
diff --git a/ui/gl/gl_bindings_autogen_gl.cc b/ui/gl/gl_bindings_autogen_gl.cc |
index 54e8f344defa7a98f38e272cf408ae865718ef4b..47becdab117fc2ad54b59d89577daf60da9b1de3 100644 |
--- a/ui/gl/gl_bindings_autogen_gl.cc |
+++ b/ui/gl/gl_bindings_autogen_gl.cc |
@@ -189,6 +189,7 @@ void DriverGL::InitializeStaticBindings() { |
reinterpret_cast<glGetBooleanvProc>(GetGLProcAddress("glGetBooleanv")); |
fn.glGetBufferParameterivFn = reinterpret_cast<glGetBufferParameterivProc>( |
GetGLProcAddress("glGetBufferParameteriv")); |
+ fn.glGetCompressedTexImageFn = 0; |
fn.glGetErrorFn = |
reinterpret_cast<glGetErrorProc>(GetGLProcAddress("glGetError")); |
fn.glGetFenceivNVFn = 0; |
@@ -1167,6 +1168,14 @@ void DriverGL::InitializeDynamicBindings(GLContext* context) { |
DCHECK(fn.glGetActiveUniformsivFn); |
} |
+ debug_fn.glGetCompressedTexImageFn = 0; |
+ if (!ver->is_es) { |
+ fn.glGetCompressedTexImageFn = |
+ reinterpret_cast<glGetCompressedTexImageProc>( |
+ GetGLProcAddress("glGetCompressedTexImage")); |
+ DCHECK(fn.glGetCompressedTexImageFn); |
+ } |
+ |
debug_fn.glGetFenceivNVFn = 0; |
if (ext.b_GL_NV_fence) { |
fn.glGetFenceivNVFn = reinterpret_cast<glGetFenceivNVProc>( |
@@ -3066,6 +3075,14 @@ Debug_glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params) { |
g_driver_gl.debug_fn.glGetBufferParameterivFn(target, pname, params); |
} |
+static void GL_BINDING_CALL |
+Debug_glGetCompressedTexImage(GLenum target, GLint lod, GLvoid* img) { |
+ GL_SERVICE_LOG("glGetCompressedTexImage" |
+ << "(" << GLEnums::GetStringEnum(target) << ", " << lod << ", " |
+ << static_cast<const void*>(img) << ")"); |
+ g_driver_gl.debug_fn.glGetCompressedTexImageFn(target, lod, img); |
+} |
+ |
static GLenum GL_BINDING_CALL Debug_glGetError(void) { |
GL_SERVICE_LOG("glGetError" |
<< "(" |
@@ -5116,6 +5133,10 @@ void DriverGL::InitializeDebugBindings() { |
debug_fn.glGetBufferParameterivFn = fn.glGetBufferParameterivFn; |
fn.glGetBufferParameterivFn = Debug_glGetBufferParameteriv; |
} |
+ if (!debug_fn.glGetCompressedTexImageFn) { |
+ debug_fn.glGetCompressedTexImageFn = fn.glGetCompressedTexImageFn; |
+ fn.glGetCompressedTexImageFn = Debug_glGetCompressedTexImage; |
+ } |
if (!debug_fn.glGetErrorFn) { |
debug_fn.glGetErrorFn = fn.glGetErrorFn; |
fn.glGetErrorFn = Debug_glGetError; |
@@ -6484,6 +6505,12 @@ void GLApiBase::glGetBufferParameterivFn(GLenum target, |
driver_->fn.glGetBufferParameterivFn(target, pname, params); |
} |
+void GLApiBase::glGetCompressedTexImageFn(GLenum target, |
+ GLint lod, |
+ GLvoid* img) { |
+ driver_->fn.glGetCompressedTexImageFn(target, lod, img); |
+} |
+ |
GLenum GLApiBase::glGetErrorFn(void) { |
return driver_->fn.glGetErrorFn(); |
} |
@@ -8240,6 +8267,13 @@ void TraceGLApi::glGetBufferParameterivFn(GLenum target, |
gl_api_->glGetBufferParameterivFn(target, pname, params); |
} |
+void TraceGLApi::glGetCompressedTexImageFn(GLenum target, |
+ GLint lod, |
+ GLvoid* img) { |
+ TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glGetCompressedTexImage") |
+ gl_api_->glGetCompressedTexImageFn(target, lod, img); |
+} |
+ |
GLenum TraceGLApi::glGetErrorFn(void) { |
TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glGetError") |
return gl_api_->glGetErrorFn(); |
@@ -10275,6 +10309,15 @@ void NoContextGLApi::glGetBufferParameterivFn(GLenum target, |
<< "Trying to call glGetBufferParameteriv() without current GL context"; |
} |
+void NoContextGLApi::glGetCompressedTexImageFn(GLenum target, |
+ GLint lod, |
+ GLvoid* img) { |
+ NOTREACHED() |
+ << "Trying to call glGetCompressedTexImage() without current GL context"; |
+ LOG(ERROR) |
+ << "Trying to call glGetCompressedTexImage() without current GL context"; |
+} |
+ |
GLenum NoContextGLApi::glGetErrorFn(void) { |
NOTREACHED() << "Trying to call glGetError() without current GL context"; |
LOG(ERROR) << "Trying to call glGetError() without current GL context"; |