diff options
| -rw-r--r-- | gpu/command_buffer/common/gl_mock.h | 9 | ||||
| -rwxr-xr-x | ui/gfx/gl/generate_bindings.py | 18 | ||||
| -rw-r--r-- | ui/gfx/gl/gl_interface.h | 13 |
3 files changed, 3 insertions, 37 deletions
diff --git a/gpu/command_buffer/common/gl_mock.h b/gpu/command_buffer/common/gl_mock.h index 1b43373..feba409 100644 --- a/gpu/command_buffer/common/gl_mock.h +++ b/gpu/command_buffer/common/gl_mock.h @@ -490,20 +490,11 @@ class MockGLInterface : public GLInterface { MOCK_METHOD4(DrawArraysInstancedANGLE, void( GLenum mode, GLint first, GLsizei count, GLsizei primcount)); - MOCK_METHOD4(DrawArraysInstancedARB, void( - GLenum mode, GLint first, GLsizei count, GLsizei primcount)); - MOCK_METHOD5(DrawElementsInstancedANGLE, void( GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount)); - MOCK_METHOD5(DrawElementsInstancedARB, void( - GLenum mode, GLsizei count, GLenum type, const void* indices, - GLsizei primcount)); - MOCK_METHOD2(VertexAttribDivisorANGLE, void(GLuint index, GLuint divisor)); - - MOCK_METHOD2(VertexAttribDivisorARB, void(GLuint index, GLuint divisor)); }; } // namespace gfx diff --git a/ui/gfx/gl/generate_bindings.py b/ui/gfx/gl/generate_bindings.py index 0681a67..2a255c7 100755 --- a/ui/gfx/gl/generate_bindings.py +++ b/ui/gfx/gl/generate_bindings.py @@ -637,27 +637,15 @@ GL_FUNCTIONS = [ 'GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length,' 'GLint* values', }, { 'return_type': 'void', - 'names': ['glDrawArraysInstancedANGLE'], + 'names': ['glDrawArraysInstancedANGLE', 'glDrawArraysInstancedARB'], 'arguments': 'GLenum mode, GLint first, GLsizei count, GLsizei primcount', }, { 'return_type': 'void', - 'names': ['glDrawArraysInstancedARB'], - 'arguments': 'GLenum mode, GLint first, GLsizei count, GLsizei primcount', }, -{ 'return_type': 'void', - 'names': ['glDrawElementsInstancedANGLE'], + 'names': ['glDrawElementsInstancedANGLE', 'glDrawElementsInstancedARB'], 'arguments': 'GLenum mode, GLsizei count, GLenum type, const void* indices, ' 'GLsizei primcount', }, { 'return_type': 'void', - 'names': ['glDrawElementsInstancedARB'], - 'arguments': - 'GLenum mode, GLsizei count, GLenum type, const void* indices, ' - 'GLsizei primcount', }, -{ 'return_type': 'void', - 'names': ['glVertexAttribDivisorANGLE'], - 'arguments': - 'GLuint index, GLuint divisor', }, -{ 'return_type': 'void', - 'names': ['glVertexAttribDivisorARB'], + 'names': ['glVertexAttribDivisorANGLE', 'glVertexAttribDivisorARB'], 'arguments': 'GLuint index, GLuint divisor', }, ] diff --git a/ui/gfx/gl/gl_interface.h b/ui/gfx/gl/gl_interface.h index f962b8d..684f9b3 100644 --- a/ui/gfx/gl/gl_interface.h +++ b/ui/gfx/gl/gl_interface.h @@ -608,27 +608,14 @@ class GL_EXPORT GLInterface { GLsizei count, GLsizei primcount) = 0; - virtual void DrawArraysInstancedARB(GLenum mode, - GLint first, - GLsizei count, - GLsizei primcount) = 0; - virtual void DrawElementsInstancedANGLE(GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount) = 0; - virtual void DrawElementsInstancedARB(GLenum mode, - GLsizei count, - GLenum type, - const void* indices, - GLsizei primcount) = 0; - virtual void VertexAttribDivisorANGLE(GLuint index, GLuint divisor) = 0; - virtual void VertexAttribDivisorARB(GLuint index, GLuint divisor) = 0; - private: static GLInterface* interface_; }; |