summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-19 03:53:09 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-19 03:53:09 +0000
commitb151ba78727d81aac36a66b8ce4f984cb78a611e (patch)
tree93d44e8c8a7bf184133756ad9ee4ba12615de285 /gpu
parentedb9a4be10a82f64b49606cdc2b6743f68ebed4e (diff)
downloadchromium_src-b151ba78727d81aac36a66b8ce4f984cb78a611e.zip
chromium_src-b151ba78727d81aac36a66b8ce4f984cb78a611e.tar.gz
chromium_src-b151ba78727d81aac36a66b8ce4f984cb78a611e.tar.bz2
Revert 78801 - Addition of GL-redirecting mechanism for the Skia/GPU back-end. During execution of the layout tests (DumpRenderTree), all GL-calls are invoked via Mesa. A GL re-direction mechanism was added to skia in revision (http://code.google.com/p/skia/source/detail?r=937) These changes populate the skia re-direction interface with the gl implementation currently in use in Chrome: The app\gfx\gl bindings. R=kbr, bsalomon
Review URL: http://codereview.chromium.org/6677105 TBR=twiz@chromium.org R=* Review URL: http://codereview.chromium.org/6712050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/common/gl_mock.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/gpu/command_buffer/common/gl_mock.h b/gpu/command_buffer/common/gl_mock.h
index fc20541..7519fc2 100644
--- a/gpu/command_buffer/common/gl_mock.h
+++ b/gpu/command_buffer/common/gl_mock.h
@@ -260,8 +260,6 @@ class MockGLInterface : public GLInterface {
MOCK_METHOD1(LinkProgram, void(GLuint program));
- MOCK_METHOD2(MapBuffer, void*(GLenum target, GLenum access));
-
MOCK_METHOD2(PixelStorei, void(GLenum pname, GLint param));
MOCK_METHOD2(PolygonOffset, void(GLfloat factor, GLfloat units));
@@ -378,8 +376,6 @@ class MockGLInterface : public GLInterface {
GLint location, GLsizei count, GLboolean transpose,
const GLfloat* value));
- MOCK_METHOD1(UnmapBuffer, GLboolean(GLenum target));
-
MOCK_METHOD1(UseProgram, void(GLuint program));
MOCK_METHOD1(ValidateProgram, void(GLuint program));