From 4ac107e6d3aec2a6cf51834b80bd2c98747cd72f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 22 Jul 2011 18:00:15 +0000 Subject: Add glBindFragDataLocationIndexedARB to the GLInterface. Add it to skia's in-proc GL function ptr struct. Required for Ganesh ui rendering. Review URL: http://codereview.chromium.org/7482003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93673 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/gfx/gl/generate_bindings.py | 2 ++ ui/gfx/gl/gl_bindings_skia_in_process.cc | 7 ++++++- ui/gfx/gl/gl_interface.h | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'ui/gfx') diff --git a/ui/gfx/gl/generate_bindings.py b/ui/gfx/gl/generate_bindings.py index e0475c2..34baccd 100644 --- a/ui/gfx/gl/generate_bindings.py +++ b/ui/gfx/gl/generate_bindings.py @@ -16,6 +16,8 @@ GL_FUNCTIONS = [ ['void', ['glBindAttribLocation'], 'GLuint program, GLuint index, const char* name'], ['void', ['glBindBuffer'], 'GLenum target, GLuint buffer'], +['void', ['glBindFragDataLocationIndexedARB'], + 'GLuint program, GLuint colorNumber, GLuint index, const char* name'], ['void', ['glBindFramebufferEXT', 'glBindFramebuffer'], 'GLenum target, GLuint framebuffer'], ['void', ['glBindRenderbufferEXT', 'glBindRenderbuffer'], diff --git a/ui/gfx/gl/gl_bindings_skia_in_process.cc b/ui/gfx/gl/gl_bindings_skia_in_process.cc index 39fdcf3..ecedc8a 100644 --- a/ui/gfx/gl/gl_bindings_skia_in_process.cc +++ b/ui/gfx/gl/gl_bindings_skia_in_process.cc @@ -35,6 +35,11 @@ GLvoid StubGLBindBuffer(GLenum target, GLuint buffer) { glBindBuffer(target, buffer); } +GLvoid StubBindFragDataLocationIndexedARB(GLuint program, GLuint colorNumber, + GLuint index, const GLchar * name) { + glBindFragDataLocationIndexedARB(program, colorNumber, index, name); +} + GLvoid StubGLBindFramebuffer(GLenum target, GLuint framebuffer) { glBindFramebufferEXT(target, framebuffer); } @@ -574,7 +579,7 @@ void BindSkiaToInProcessGL() { NULL, // glResolveMultisampleFramebuffer StubGLMapBuffer, StubGLUnmapBuffer, - NULL, // glBindFragDataLocationIndexed + StubBindFragDataLocationIndexedARB, GrGLInterface::kStaticInitEndGuard, }; GrGLSetGLInterface(&host_gl_interface); diff --git a/ui/gfx/gl/gl_interface.h b/ui/gfx/gl/gl_interface.h index 3c3b3fa..4b483c1 100644 --- a/ui/gfx/gl/gl_interface.h +++ b/ui/gfx/gl/gl_interface.h @@ -34,6 +34,11 @@ class GLInterface { virtual void BindBuffer(GLenum target, GLuint buffer) = 0; + virtual void BindFragDataLocationIndexedARB(GLuint program, + GLuint colorNumber, + GLuint index, + const char* name) = 0; + virtual void BindFramebufferEXT(GLenum target, GLuint framebuffer) = 0; virtual void BindRenderbufferEXT(GLenum target, GLuint renderbuffer) = 0; -- cgit v1.1