summaryrefslogtreecommitdiffstats
path: root/ui/gfx/gl
diff options
context:
space:
mode:
authorbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 21:06:12 +0000
committerbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 21:06:12 +0000
commit885ff958eb7a516ecad841fe7789a82445082462 (patch)
tree5cfcc004dcbdbd04b7db41dc77ca0c7fd5fadc1d /ui/gfx/gl
parente906982dbcbfd66df7ef447ad68ec5615d9c7fbe (diff)
downloadchromium_src-885ff958eb7a516ecad841fe7789a82445082462.zip
chromium_src-885ff958eb7a516ecad841fe7789a82445082462.tar.gz
chromium_src-885ff958eb7a516ecad841fe7789a82445082462.tar.bz2
Roll skia to r2967. Add skia bindings for glTexStorage2D.
BUG=none TEST=none Review URL: http://codereview.chromium.org/9111017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/gl')
-rw-r--r--ui/gfx/gl/gl_bindings_skia_in_process.cc6
1 files changed, 6 insertions, 0 deletions
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;