Revert 89002 - Enforce RGB even on buggy drivers.

gpu/command_buffer/service/framebuffer_manager.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "gpu/command_buffer/common/gles2_cmd_utils.h"
 
 namespace gpu {
 namespace gles2 {
 
@@ skipping 24 matching lines @@
   }
 
   virtual bool cleared() const {
     return render_buffer_->cleared();
   }
 
   virtual void set_cleared() {
     render_buffer_->set_cleared();
   }
 
-  virtual bool IsTexture(TextureManager::TextureInfo* /* texture */) const {
-    return false;
-  }
-
   RenderbufferManager::RenderbufferInfo* render_buffer() const {
     return render_buffer_.get();
   }
 
  private:
   RenderbufferManager::RenderbufferInfo::Ref render_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderbufferAttachment);
 };
 
@@ skipping 36 matching lines @@
 
   virtual bool cleared() const {
     // Textures are cleared on creation.
     return true;
   }
 
   virtual void set_cleared() {
     NOTREACHED();
   }
 
-  virtual bool IsTexture(TextureManager::TextureInfo* texture) const {
-    return texture == texture_.get();
-  }
-
   TextureManager::TextureInfo* texture() const {
     return texture_.get();
   }
 
  private:
   TextureManager::TextureInfo::Ref texture_;
   GLenum target_;
   GLint level_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureAttachment);
@@ skipping 50 matching lines @@
 void FramebufferManager::FramebufferInfo::MarkAttachedRenderbuffersAsCleared() {
   for (AttachmentMap::iterator it = attachments_.begin();
        it != attachments_.end(); ++it) {
     Attachment* attachment = it->second;
     if (!attachment->cleared()) {
       attachment->set_cleared();
     }
   }
 }
 
-bool FramebufferManager::FramebufferInfo::HasDepthAttachment() const {
-  return attachments_.find(GL_DEPTH_STENCIL_ATTACHMENT) != attachments_.end() ||
-         attachments_.find(GL_DEPTH_ATTACHMENT) != attachments_.end();
-}
-
-bool FramebufferManager::FramebufferInfo::HasStencilAttachment() const {
-  return attachments_.find(GL_DEPTH_STENCIL_ATTACHMENT) != attachments_.end() ||
-         attachments_.find(GL_STENCIL_ATTACHMENT) != attachments_.end();
-}
-
-GLenum FramebufferManager::FramebufferInfo::GetColorAttachmentFormat() const {
-  AttachmentMap::const_iterator it = attachments_.find(GL_COLOR_ATTACHMENT0);
-  if (it == attachments_.end()) {
-    return 0;
-  }
-  const Attachment* attachment = it->second;
-  return attachment->internal_format();
-}
-
 bool FramebufferManager::FramebufferInfo::IsNotComplete() const {
   for (AttachmentMap::const_iterator it = attachments_.begin();
        it != attachments_.end(); ++it) {
     Attachment* attachment = it->second;
     if (attachment->width() == 0 || attachment->height() == 0) {
       return true;
     }
   }
   return false;
 }
@@ skipping 26 matching lines @@
   }
 }
 
 void FramebufferManager::FramebufferInfo::AttachTexture(
     GLenum attachment, TextureManager::TextureInfo* texture, GLenum target,
     GLint level) {
   DCHECK(attachment == GL_COLOR_ATTACHMENT0 ||
          attachment == GL_DEPTH_ATTACHMENT ||
          attachment == GL_STENCIL_ATTACHMENT ||
          attachment == GL_DEPTH_STENCIL_ATTACHMENT);
-  const Attachment* a = GetAttachment(attachment);
-  if (a && a->IsTexture(texture)) {
-    texture->DetachFromFramebuffer();
-  }
   if (texture) {
     attachments_[attachment] = Attachment::Ref(
         new TextureAttachment(texture, target, level));
-    texture->AttachToFramebuffer();
   } else {
     attachments_.erase(attachment);
   }
 }
 
 const FramebufferManager::FramebufferInfo::Attachment*
     FramebufferManager::FramebufferInfo::GetAttachment(
         GLenum attachment) const {
   AttachmentMap::const_iterator it = attachments_.find(attachment);
   if (it != attachments_.end()) {
@@ skipping 12 matching lines @@
       return true;
     }
   }
   return false;
 }
 
 }  // namespace gles2
 }  // namespace gpu