diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 1 | ||||
| -rw-r--r-- | ui/gfx/gl/gl_bindings_skia_in_process.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/gl_bindings_skia_cmd_buffer.cc | 1 |
4 files changed, 9 insertions, 1 deletions
@@ -36,7 +36,7 @@ vars = { "lss_revision": "9", "ffmpeg_revision": "112050", "sfntly_revision": "118", - "skia_revision": "2947", + "skia_revision": "2967", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index 5eae760..ad13aa3 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -947,6 +947,7 @@ typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GL #ifndef GL_EXT_texture_storage #define GL_EXT_texture_storage 1 #ifdef GL_GLEXT_PROTOTYPES +#define glTexStorage2DEXT GLES2_GET_FUN(TexStorage2DEXT) GL_APICALL void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); #endif /* GL_GLEXT_PROTOTYPES */ typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXT) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); diff --git a/ui/gfx/gl/gl_bindings_skia_in_process.cc b/ui/gfx/gl/gl_bindings_skia_in_process.cc index 2b84006..609c442 100644 --- a/ui/gfx/gl/gl_bindings_skia_in_process.cc +++ b/ui/gfx/gl/gl_bindings_skia_in_process.cc @@ -407,6 +407,11 @@ GLvoid StubGLTexParameteri(GLenum target, GLenum pname, GLint param) { glTexParameteri(target, pname, param); } +GLvoid StubGLTexStorage2D(GLenum target, GLsizei levels, GLenum internalFormat, + GLsizei width, GLsizei height) { + glTexStorage2DEXT(target, levels, internalFormat, width, height); +} + GLvoid StubGLTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels) { @@ -621,6 +626,7 @@ GrGLInterface* CreateInProcessSkiaGLBinding() { interface->fTexImage2D = StubGLTexImage2D; interface->fTexParameteri = StubGLTexParameteri; interface->fTexSubImage2D = StubGLTexSubImage2D; + interface->fTexStorage2D = StubGLTexStorage2D; interface->fUniform1f = StubGLUniform1f; interface->fUniform1i = StubGLUniform1i; interface->fUniform1fv = StubGLUniform1fv; diff --git a/webkit/glue/gl_bindings_skia_cmd_buffer.cc b/webkit/glue/gl_bindings_skia_cmd_buffer.cc index 9a44070..04b170e 100644 --- a/webkit/glue/gl_bindings_skia_cmd_buffer.cc +++ b/webkit/glue/gl_bindings_skia_cmd_buffer.cc @@ -74,6 +74,7 @@ GrGLInterface* CreateCommandBufferSkiaGLBinding() { interface->fStencilOpSeparate = glStencilOpSeparate; interface->fTexImage2D = glTexImage2D; interface->fTexParameteri = glTexParameteri; + interface->fTexStorage2D = glTexStorage2DEXT; interface->fTexSubImage2D = glTexSubImage2D; interface->fUniform1f = glUniform1f; interface->fUniform1i = glUniform1i; |