summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authortwiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-21 23:08:32 +0000
committertwiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-21 23:08:32 +0000
commit8f1ab37a268834e9a71330401d90b4e3bbfd5604 (patch)
tree665226b867eac12a02eeecd6a2395996d873a38b /gpu
parentc09f1a619592294610cc3a4f07cb83c16735fb9d (diff)
downloadchromium_src-8f1ab37a268834e9a71330401d90b4e3bbfd5604.zip
chromium_src-8f1ab37a268834e9a71330401d90b4e3bbfd5604.tar.gz
chromium_src-8f1ab37a268834e9a71330401d90b4e3bbfd5604.tar.bz2
Resubmit of reverted CL: http://codereview.chromium.org/6677105
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/6708066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/common/gl_mock.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/gpu/command_buffer/common/gl_mock.h b/gpu/command_buffer/common/gl_mock.h
index 7519fc2..fc20541 100644
--- a/gpu/command_buffer/common/gl_mock.h
+++ b/gpu/command_buffer/common/gl_mock.h
@@ -260,6 +260,8 @@ 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));
@@ -376,6 +378,8 @@ 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));