Merge 193302 "Force GPU switch with CGLSetVirtualScreen only for..."

gpu/command_buffer/service/framebuffer_manager.cc

 // Copyright (c) 2012 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/framebuffer_manager.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace gpu {
 namespace gles2 {
 
 Framebuffer::FramebufferComboCompleteMap*
     Framebuffer::framebuffer_combo_complete_map_;
 
+// Framebuffer completeness is not cacheable on OS X because of dynamic
+// graphics switching.
+// http://crbug.com/180876
+#if defined(OS_MACOSX)
+bool Framebuffer::allow_framebuffer_combo_complete_map_ = false;
+#else
+bool Framebuffer::allow_framebuffer_combo_complete_map_ = true;
+#endif
+
 void Framebuffer::ClearFramebufferCompleteComboMap() {
   if (framebuffer_combo_complete_map_) {
     framebuffer_combo_complete_map_->clear();
   }
 }
 
 class RenderbufferAttachment
     : public Framebuffer::Attachment {
  public:
   explicit RenderbufferAttachment(
@@ skipping 342 matching lines @@
   }
 
   // This does not mean the framebuffer is actually complete. It just means our
   // checks passed.
   return GL_FRAMEBUFFER_COMPLETE;
 }
 
 GLenum Framebuffer::GetStatus(
     TextureManager* texture_manager, GLenum target) const {
   // Check if we have this combo already.
-  std::string signature(base::StringPrintf("|FBO|target=%04x", target));
-  for (AttachmentMap::const_iterator it = attachments_.begin();
-       it != attachments_.end(); ++it) {
-    Attachment* attachment = it->second;
-    signature += base::StringPrintf(
-        "|Attachment|attachmentpoint=%04x", it->first);
-    attachment->AddToSignature(texture_manager, &signature);
+  std::string signature;
+  if (allow_framebuffer_combo_complete_map_) {
+    signature = base::StringPrintf("|FBO|target=%04x", target);
+    for (AttachmentMap::const_iterator it = attachments_.begin();
+         it != attachments_.end(); ++it) {
+      Attachment* attachment = it->second;
+      signature += base::StringPrintf(
+          "|Attachment|attachmentpoint=%04x", it->first);
+      attachment->AddToSignature(texture_manager, &signature);
+    }
+
+    if (!framebuffer_combo_complete_map_) {
+      framebuffer_combo_complete_map_ = new FramebufferComboCompleteMap();
+    }
+
+    FramebufferComboCompleteMap::const_iterator it =
+        framebuffer_combo_complete_map_->find(signature);
+    if (it != framebuffer_combo_complete_map_->end()) {
+      return GL_FRAMEBUFFER_COMPLETE;
+    }
   }
 
-  if (!framebuffer_combo_complete_map_) {
-    framebuffer_combo_complete_map_ = new FramebufferComboCompleteMap();
+  GLenum result = glCheckFramebufferStatusEXT(target);
+
+  // Insert the new result into the combo map.
+  if (allow_framebuffer_combo_complete_map_ &&
+      result == GL_FRAMEBUFFER_COMPLETE) {
+    framebuffer_combo_complete_map_->insert(std::make_pair(signature, true));
   }
 
-  FramebufferComboCompleteMap::const_iterator it =
-      framebuffer_combo_complete_map_->find(signature);
-  if (it != framebuffer_combo_complete_map_->end()) {
-    return GL_FRAMEBUFFER_COMPLETE;
-  }
-  GLenum result = glCheckFramebufferStatusEXT(target);
-  if (result == GL_FRAMEBUFFER_COMPLETE) {
-    framebuffer_combo_complete_map_->insert(std::make_pair(signature, true));
-  }
   return result;
 }
 
 bool Framebuffer::IsCleared() const {
   // are all the attachments cleaared?
   for (AttachmentMap::const_iterator it = attachments_.begin();
        it != attachments_.end(); ++it) {
     Attachment* attachment = it->second;
     if (!attachment->cleared()) {
       return false;
@@ skipping 142 matching lines @@
     Framebuffer* framebuffer) {
   DCHECK(framebuffer);
   return framebuffer->framebuffer_complete_state_count_id() ==
       framebuffer_state_change_count_;
 }
 
 }  // namespace gles2
 }  // namespace gpu