Make DeleteFramebuffer rebind fbo backbuffer

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2011 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 <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 858 matching lines @@
   // location is not -1.
   bool CheckCurrentProgramForUniform(GLint location, const char* function_name);
 
   // Gets the type of a uniform for a location in the current program. Sets GL
   // errors if the current program is not valid. Returns true if the current
   // program is valid and the location exists. Adjusts count so it
   // does not overflow the uniform.
   bool PrepForSetUniformByLocation(
       GLint location, const char* function_name, GLenum* type, GLsizei* count);
 
+  // Gets the service id for any simulated backbuffer fbo.
+  GLuint GetBackbufferServiceId();
+
   // Helper for glGetBooleanv, glGetFloatv and glGetIntegerv
   bool GetHelper(GLenum pname, GLint* params, GLsizei* num_written);
 
   // Wrapper for glCreateProgram
   bool CreateProgramHelper(GLuint client_id);
 
   // Wrapper for glCreateShader
   bool CreateShaderHelper(GLenum type, GLuint client_id);
 
   // Wrapper for glActiveTexture
@@ skipping 1268 matching lines @@
     if (info) {
       GLuint service_id = info->service_id();
       glDeleteBuffersARB(1, &service_id);
       RemoveBufferInfo(client_ids[ii]);
     }
   }
 }
 
 void GLES2DecoderImpl::DeleteFramebuffersHelper(
     GLsizei n, const GLuint* client_ids) {
+  bool supports_seperate_framebuffer_binds =
+     feature_info_->feature_flags().chromium_framebuffer_multisample;
+
   for (GLsizei ii = 0; ii < n; ++ii) {
     FramebufferManager::FramebufferInfo* info =
         GetFramebufferInfo(client_ids[ii]);
     if (info) {
       if (info == bound_draw_framebuffer_) {
         bound_draw_framebuffer_ = NULL;
         state_dirty_ = true;
+        GLenum target = supports_seperate_framebuffer_binds ?

[alokp, 2011/10/31 21:00:54]

It seems in cases where (bound_draw_framebuffer_ == bound_read_framebuffer_) you
will be calling glBindFramebufferEXT(GL_FRAMEBUFFER, GetBackbufferServiceId())
twice. Is it worth optimizing?

+            GL_DRAW_FRAMEBUFFER : GL_FRAMEBUFFER;
+        glBindFramebufferEXT(target, GetBackbufferServiceId());
+      }
+      if (info == bound_read_framebuffer_) {
+        bound_read_framebuffer_ = NULL;
+        GLenum target = supports_seperate_framebuffer_binds ?
+            GL_READ_FRAMEBUFFER : GL_FRAMEBUFFER;
+        glBindFramebufferEXT(target, GetBackbufferServiceId());
       }
       GLuint service_id = info->service_id();
       glDeleteFramebuffersEXT(1, &service_id);
       RemoveFramebufferInfo(client_ids[ii]);
     }
   }
 }
 
 void GLES2DecoderImpl::DeleteRenderbuffersHelper(
     GLsizei n, const GLuint* client_ids) {
@@ skipping 648 matching lines @@
     glDepthMask(mask_depth_ && have_depth);
     EnableDisable(GL_DEPTH_TEST, enable_depth_test_ && have_depth);
     bool have_stencil = BoundFramebufferHasStencilAttachment();
     glStencilMaskSeparate(GL_FRONT, have_stencil ? mask_stencil_front_ : 0);
     glStencilMaskSeparate(GL_BACK, have_stencil ? mask_stencil_back_ : 0);
     EnableDisable(GL_STENCIL_TEST, enable_stencil_test_ && have_stencil);
     state_dirty_ = false;
   }
 }
 
+GLuint GLES2DecoderImpl::GetBackbufferServiceId() {
+  return (offscreen_target_frame_buffer_.get()) ?
+      offscreen_target_frame_buffer_->id() :
+      surface_->GetBackingFrameBufferObject();
+}
+
 void GLES2DecoderImpl::DoBindFramebuffer(GLenum target, GLuint client_id) {
   FramebufferManager::FramebufferInfo* info = NULL;
   GLuint service_id = 0;
   if (client_id != 0) {
     info = GetFramebufferInfo(client_id);
     if (!info) {
       if (!group_->bind_generates_resource()) {
         SetGLError(GL_INVALID_VALUE,
                    "glBindFramebuffer: id not generated by glGenFramebuffers");
         return;
       }
 
       // It's a new id so make a framebuffer info for it.
       glGenFramebuffersEXT(1, &service_id);
       CreateFramebufferInfo(client_id, service_id);
       info = GetFramebufferInfo(client_id);
       IdAllocatorInterface* id_allocator =
           group_->GetIdAllocator(id_namespaces::kFramebuffers);
       id_allocator->MarkAsUsed(client_id);
     } else {
       service_id = info->service_id();
     }
     info->MarkAsValid();
-  } else {
-    service_id = surface_->GetBackingFrameBufferObject();
   }
 
   if (target == GL_FRAMEBUFFER || target == GL_DRAW_FRAMEBUFFER_EXT) {
     bound_draw_framebuffer_ = info;
   }
   if (target == GL_FRAMEBUFFER || target == GL_READ_FRAMEBUFFER_EXT) {
     bound_read_framebuffer_ = info;
   }
 
   state_dirty_ = true;
 
-  // When rendering to an offscreen frame buffer, instead of unbinding from
-  // the current frame buffer, bind to the offscreen target frame buffer.
-  if (info == NULL && offscreen_target_frame_buffer_.get()) {
-    service_id = offscreen_target_frame_buffer_->id();
+  // If we are rendering to the backbuffer get the FBO id for any simulated
+  // backbuffer.
+  if (info == NULL) {
+    service_id = GetBackbufferServiceId();
   }
 
   glBindFramebufferEXT(target, service_id);
 }
 
 void GLES2DecoderImpl::DoBindRenderbuffer(GLenum target, GLuint client_id) {
   RenderbufferManager::RenderbufferInfo* info = NULL;
   GLuint service_id = 0;
   if (client_id != 0) {
     info = GetRenderbufferInfo(client_id);
@@ skipping 4314 matching lines @@
   return error::kNoError;
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu