summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 16:35:56 +0000
committerbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 16:35:56 +0000
commitbb6ab33c6e87658e52e881d5de8fad24ceac710e (patch)
tree43f85518714a62f6e6f0d6806ff1c4e11b3adcfc
parent96a3c837397b1abb47b6a54e83bdf11b218cad53 (diff)
downloadchromium_src-bb6ab33c6e87658e52e881d5de8fad24ceac710e.zip
chromium_src-bb6ab33c6e87658e52e881d5de8fad24ceac710e.tar.gz
chromium_src-bb6ab33c6e87658e52e881d5de8fad24ceac710e.tar.bz2
Wire glDiscardFramebuffer up to Skia.
BUG=skia:2349 Review URL: https://codereview.chromium.org/216833005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260562 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc1
-rw-r--r--ui/gl/gl_bindings_skia_in_process.cc6
2 files changed, 7 insertions, 0 deletions
diff --git a/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc b/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc
index 9803816..b8079d1 100644
--- a/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc
+++ b/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc
@@ -51,6 +51,7 @@ GrGLInterface* CreateCommandBufferSkiaGLBinding() {
functions->fDepthMask = glDepthMask;
functions->fDisable = glDisable;
functions->fDisableVertexAttribArray = glDisableVertexAttribArray;
+ functions->fDiscardFramebuffer = glDiscardFramebufferEXT;
functions->fDrawArrays = glDrawArrays;
functions->fDrawElements = glDrawElements;
functions->fEnable = glEnable;
diff --git a/ui/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
index 28da2c7..0e2dfe5 100644
--- a/ui/gl/gl_bindings_skia_in_process.cc
+++ b/ui/gl/gl_bindings_skia_in_process.cc
@@ -187,6 +187,11 @@ GLvoid StubGLDisableVertexAttribArray(GLuint index) {
glDisableVertexAttribArray(index);
}
+GLvoid StubGLDiscardFramebuffer(GLenum target, GLsizei numAttachments,
+ const GLenum *attachments) {
+ glDiscardFramebufferEXT(target, numAttachments, attachments);
+}
+
GLvoid StubGLDrawArrays(GLenum mode, GLint first, GLsizei count) {
glDrawArrays(mode, first, count);
}
@@ -631,6 +636,7 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
functions->fDepthMask = StubGLDepthMask;
functions->fDisable = StubGLDisable;
functions->fDisableVertexAttribArray = StubGLDisableVertexAttribArray;
+ functions->fDiscardFramebuffer = StubGLDiscardFramebuffer;
functions->fDrawArrays = StubGLDrawArrays;
functions->fDrawBuffer = StubGLDrawBuffer;
functions->fDrawBuffers = StubGLDrawBuffers;