summaryrefslogtreecommitdiffstats
path: root/ui/gl
diff options
context:
space:
mode:
authorbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-01 17:49:50 +0000
committerbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-01 17:49:50 +0000
commit8e91f87f1cca887e735bd462742f21a3cb799810 (patch)
tree66a1116c27f6385e8c889d19b4aaa6bb6b5cc3eb /ui/gl
parent07b7a9f946e8d58940e50f14167dd7ee9632f2c9 (diff)
downloadchromium_src-8e91f87f1cca887e735bd462742f21a3cb799810.zip
chromium_src-8e91f87f1cca887e735bd462742f21a3cb799810.tar.gz
chromium_src-8e91f87f1cca887e735bd462742f21a3cb799810.tar.bz2
Roll Skia to r4102.
Control your roll: https://chromiumcodereview.appspot.com/9252024 Review URL: https://chromiumcodereview.appspot.com/10441122 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl')
-rw-r--r--ui/gl/gl_bindings_skia_in_process.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
index a2f6433..f456266 100644
--- a/ui/gl/gl_bindings_skia_in_process.cc
+++ b/ui/gl/gl_bindings_skia_in_process.cc
@@ -407,6 +407,10 @@ GLvoid StubGLTexParameteri(GLenum target, GLenum pname, GLint param) {
glTexParameteri(target, pname, param);
}
+GLvoid StubGLTexParameteriv(GLenum target, GLenum pname, const GLint* params) {
+ glTexParameteriv(target, pname, params);
+}
+
GLvoid StubGLTexStorage2D(GLenum target, GLsizei levels, GLenum internalFormat,
GLsizei width, GLsizei height) {
glTexStorage2DEXT(target, levels, internalFormat, width, height);
@@ -625,6 +629,7 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
interface->fStencilOpSeparate = StubGLStencilOpSeparate;
interface->fTexImage2D = StubGLTexImage2D;
interface->fTexParameteri = StubGLTexParameteri;
+ interface->fTexParameteriv = StubGLTexParameteriv;
interface->fTexSubImage2D = StubGLTexSubImage2D;
interface->fTexStorage2D = StubGLTexStorage2D;
interface->fUniform1f = StubGLUniform1f;