diff options
| -rw-r--r-- | gpu/command_buffer/common/gl_mock.h | 3 | ||||
| -rw-r--r-- | ui/gfx/gl/generate_bindings.py | 2 | ||||
| -rw-r--r-- | ui/gfx/gl/gl_bindings_skia_in_process.cc | 7 | ||||
| -rw-r--r-- | ui/gfx/gl/gl_interface.h | 5 |
4 files changed, 16 insertions, 1 deletions
diff --git a/gpu/command_buffer/common/gl_mock.h b/gpu/command_buffer/common/gl_mock.h index ed39af4..8533507 100644 --- a/gpu/command_buffer/common/gl_mock.h +++ b/gpu/command_buffer/common/gl_mock.h @@ -28,6 +28,9 @@ class MockGLInterface : public GLInterface { MOCK_METHOD2(BindBuffer, void(GLenum target, GLuint buffer)); + MOCK_METHOD4(BindFragDataLocationIndexedARB, void(GLuint program, + GLuint colorNumber, GLuint index, const char* name)); + MOCK_METHOD2(BindFramebufferEXT, void(GLenum target, GLuint framebuffer)); MOCK_METHOD2(BindRenderbufferEXT, void(GLenum target, GLuint renderbuffer)); 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; |