command_buffer: Defer restoring of FBO bindings when changing virtual contexts

gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 72 matching lines @@
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE), *result);
 }
 
 TEST_P(GLES2DecoderWithShaderTest, BindAndDeleteFramebuffer) {
   SetupTexture();
   AddExpectationsForSimulatedAttrib0(kNumVertices, 0);
   SetupExpectationsForApplyingDefaultDirtyState();
   DoBindFramebuffer(
       GL_FRAMEBUFFER, client_framebuffer_id_, kServiceFramebufferId);
-  DoDeleteFramebuffer(client_framebuffer_id_,
-                      kServiceFramebufferId,
-                      true,
-                      GL_FRAMEBUFFER,
-                      0,
-                      true,
-                      GL_FRAMEBUFFER,
-                      0);
+  DoDeleteFramebuffer(client_framebuffer_id_, kServiceFramebufferId);
+  EXPECT_CALL(*gl_, BindFramebufferEXT(GL_FRAMEBUFFER, 0))
+      .Times(1)
+      .RetiresOnSaturation();
   EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
       .Times(1)
       .RetiresOnSaturation();
   DrawArrays cmd;
   cmd.Init(GL_TRIANGLES, 0, kNumVertices);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 TEST_P(GLES2DecoderTest, FramebufferRenderbufferWithNoBoundTarget) {
@@ skipping 2635 matching lines @@
   EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer));
 
   // Test deleting renderbuffer marks fbo as not complete.
   DoDeleteRenderbuffer(client_renderbuffer_id_, kServiceRenderbufferId);
   if (bound_fbo) {
     EXPECT_FALSE(framebuffer_manager->IsComplete(framebuffer));
   } else {
     EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer));
   }
   // Cleanup
-  DoDeleteFramebuffer(client_framebuffer_id_,
-                      kServiceFramebufferId,
-                      bound_fbo,
-                      GL_FRAMEBUFFER,
-                      0,
-                      bound_fbo,
-                      GL_FRAMEBUFFER,
-                      0);
+  DoDeleteFramebuffer(client_framebuffer_id_, kServiceFramebufferId);
 }
 
 TEST_P(GLES2DecoderWithShaderTest,
        RenderbufferChangesMarkFBOAsNotCompleteBoundFBO) {
   CheckRenderbufferChangesMarkFBOAsNotComplete(true);
 }
 
 TEST_P(GLES2DecoderWithShaderTest,
        RenderbufferChangesMarkFBOAsNotCompleteUnboundFBO) {
   CheckRenderbufferChangesMarkFBOAsNotComplete(false);
@@ skipping 22 matching lines @@
   DoFramebufferTexture2D(GL_FRAMEBUFFER,
                          GL_COLOR_ATTACHMENT0,
                          GL_TEXTURE_2D,
                          kFBOClientTextureId,
                          kFBOServiceTextureId,
                          0,
                          GL_NO_ERROR);
 
   DoBindRenderbuffer(
       GL_RENDERBUFFER, client_renderbuffer_id_, kServiceRenderbufferId);
-  DoBindFramebuffer(
-      GL_FRAMEBUFFER, client_framebuffer_id_, kServiceFramebufferId);
   DoRenderbufferStorage(GL_RENDERBUFFER,
                         GL_DEPTH_COMPONENT16,
                         GL_DEPTH_COMPONENT,
                         1,
                         1,
                         GL_NO_ERROR);
   DoFramebufferRenderbuffer(GL_FRAMEBUFFER,
                             GL_DEPTH_ATTACHMENT,
                             GL_RENDERBUFFER,
                             client_renderbuffer_id_,
@@ skipping 44 matching lines @@
   framebuffer_manager->MarkAsComplete(framebuffer);
   EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer));
   DoDeleteTexture(kFBOClientTextureId, kFBOServiceTextureId);
 
   if (bound_fbo) {
     EXPECT_FALSE(framebuffer_manager->IsComplete(framebuffer));
   } else {
     EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer));
   }
   // Cleanup
-  DoDeleteFramebuffer(client_framebuffer_id_,
-                      kServiceFramebufferId,
-                      bound_fbo,
-                      GL_FRAMEBUFFER,
-                      0,
-                      bound_fbo,
-                      GL_FRAMEBUFFER,
-                      0);
+  DoDeleteFramebuffer(client_framebuffer_id_, kServiceFramebufferId);
 }
 
 TEST_P(GLES2DecoderWithShaderTest, TextureChangesMarkFBOAsNotCompleteBoundFBO) {
   CheckTextureChangesMarkFBOAsNotComplete(true);
 }
 
 TEST_P(GLES2DecoderWithShaderTest,
        TextureChangesMarkFBOAsNotCompleteUnboundFBO) {
   CheckTextureChangesMarkFBOAsNotComplete(false);
 }
@@ skipping 423 matching lines @@
   EXPECT_EQ(1, result->GetNumResults());
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 // TODO(gman): PixelStorei
 
 // TODO(gman): SwapBuffers
 
 }  // namespace gles2
 }  // namespace gpu