summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-04 18:59:27 +0000
committerbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-04 18:59:27 +0000
commit5b5a9d8955006ba4f8afe940937a70e656e0e41f (patch)
tree83e27860b57c5df5b2cfec48febe9d6453187043 /gpu
parentc7e593a2845fa89985b261026115a5acc475fcbd (diff)
downloadchromium_src-5b5a9d8955006ba4f8afe940937a70e656e0e41f.zip
chromium_src-5b5a9d8955006ba4f8afe940937a70e656e0e41f.tar.gz
chromium_src-5b5a9d8955006ba4f8afe940937a70e656e0e41f.tar.bz2
Roll skia to r2034 (and add new gl bindings)
Review URL: http://codereview.chromium.org/7564013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/common/gl_mock.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/gpu/command_buffer/common/gl_mock.h b/gpu/command_buffer/common/gl_mock.h
index 8533507..bdd328c 100644
--- a/gpu/command_buffer/common/gl_mock.h
+++ b/gpu/command_buffer/common/gl_mock.h
@@ -135,6 +135,10 @@ class MockGLInterface : public GLInterface {
MOCK_METHOD3(DrawArrays, void(GLenum mode, GLint first, GLsizei count));
+ MOCK_METHOD1(DrawBuffer, void(GLenum mode));
+
+ MOCK_METHOD2(DrawBuffersARB, void(GLsizei n, const GLenum* bufs));
+
MOCK_METHOD4(DrawElements, void(
GLenum mode, GLsizei count, GLenum type, const void* indices));
@@ -272,6 +276,8 @@ class MockGLInterface : public GLInterface {
MOCK_METHOD2(PolygonOffset, void(GLfloat factor, GLfloat units));
+ MOCK_METHOD1(ReadBuffer, void(GLenum src));
+
MOCK_METHOD7(ReadPixels, void(
GLint x, GLint y, GLsizei width, GLsizei height, GLenum format,
GLenum type, void* pixels));