gpu: Add missing ScopedRenderTo

boliu · Commit bot · commit 2e7d8a7a6d19 · 2014-10-16T20:35:33.000Z
MailboxSynchronizer which is used by Android WebView depends on them for correct synchronization. BUG=424293 Review URL: https://codereview.chromium.org/653533005 Cr-Commit-Position: refs/heads/master@{#299969}
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -4358,6 +4358,7 @@ void GLES2DecoderImpl::DoDiscardFramebufferEXT(GLenum target,
     translated_attachments[i] = attachment;
   }
 
+  ScopedRenderTo do_render(framebuffer);
   glDiscardFramebufferEXT(target, numAttachments, translated_attachments.get());
 }
 
@@ -4999,6 +5000,7 @@ error::Error GLES2DecoderImpl::DoClear(GLbitfield mask) {
   DCHECK(!ShouldDeferDraws());
   if (CheckBoundFramebuffersValid("glClear")) {
     ApplyDirtyState();
+    ScopedRenderTo do_render(framebuffer_state_.bound_draw_framebuffer.get());
     glClear(mask);
   }
   return error::kNoError;
@@ -5300,6 +5302,7 @@ void GLES2DecoderImpl::DoBlitFramebufferCHROMIUM(
   }
 
   state_.SetDeviceCapabilityState(GL_SCISSOR_TEST, false);
+  ScopedRenderTo do_render(framebuffer_state_.bound_draw_framebuffer.get());
   BlitFramebufferHelper(
       srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
   state_.SetDeviceCapabilityState(GL_SCISSOR_TEST,

Original file line number	Diff line number	Diff line change
`@@ -4358,6 +4358,7 @@ void GLES2DecoderImpl::DoDiscardFramebufferEXT(GLenum target,`
`4358`	`4358`	`translated_attachments[i] = attachment;`
`4359`	`4359`	`}`
`4360`	`4360`
	`4361`	`+ ScopedRenderTo do_render(framebuffer);`
`4361`	`4362`	`glDiscardFramebufferEXT(target, numAttachments, translated_attachments.get());`
`4362`	`4363`	`}`
`4363`	`4364`
`@@ -4999,6 +5000,7 @@ error::Error GLES2DecoderImpl::DoClear(GLbitfield mask) {`
`4999`	`5000`	`DCHECK(!ShouldDeferDraws());`
`5000`	`5001`	`if (CheckBoundFramebuffersValid("glClear")) {`
`5001`	`5002`	`ApplyDirtyState();`
	`5003`	`+ ScopedRenderTo do_render(framebuffer_state_.bound_draw_framebuffer.get());`
`5002`	`5004`	`glClear(mask);`
`5003`	`5005`	`}`
`5004`	`5006`	`return error::kNoError;`
`@@ -5300,6 +5302,7 @@ void GLES2DecoderImpl::DoBlitFramebufferCHROMIUM(`
`5300`	`5302`	`}`
`5301`	`5303`
`5302`	`5304`	`state_.SetDeviceCapabilityState(GL_SCISSOR_TEST, false);`
	`5305`	`+ ScopedRenderTo do_render(framebuffer_state_.bound_draw_framebuffer.get());`
`5303`	`5306`	`BlitFramebufferHelper(`
`5304`	`5307`	`srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);`
`5305`	`5308`	`state_.SetDeviceCapabilityState(GL_SCISSOR_TEST,`