Revert 89002 - Enforce RGB even on buggy drivers.

gpu/command_buffer/service/framebuffer_manager_unittest.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 "gpu/command_buffer/service/feature_info.h"
 
 #include "gpu/command_buffer/common/gl_mock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
@@ skipping 103 matching lines @@
 const GLuint FramebufferInfoTest::kService1Id;
 #endif
 
 TEST_F(FramebufferInfoTest, Basic) {
   EXPECT_EQ(kService1Id, info_->service_id());
   EXPECT_FALSE(info_->IsDeleted());
   EXPECT_TRUE(NULL == info_->GetAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_TRUE(NULL == info_->GetAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_TRUE(NULL == info_->GetAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_TRUE(NULL == info_->GetAttachment(GL_DEPTH_STENCIL_ATTACHMENT));
-  EXPECT_FALSE(info_->HasDepthAttachment());
-  EXPECT_FALSE(info_->HasStencilAttachment());
-  EXPECT_EQ(static_cast<GLenum>(0), info_->GetColorAttachmentFormat());
 }
 
 TEST_F(FramebufferInfoTest, AttachRenderbuffer) {
   const GLuint kRenderbufferClient1Id = 33;
   const GLuint kRenderbufferService1Id = 333;
   const GLuint kRenderbufferClient2Id = 34;
   const GLuint kRenderbufferService2Id = 334;
   const GLint kMaxRenderbufferSize = 128;
   const GLsizei kWidth1 = 16;
   const GLsizei kHeight1 = 32;
@@ skipping 19 matching lines @@
       kRenderbufferClient1Id, kRenderbufferService1Id);
   RenderbufferManager::RenderbufferInfo* rb_info1 =
       rb_manager.GetRenderbufferInfo(kRenderbufferClient1Id);
   ASSERT_TRUE(rb_info1 != NULL);
 
   // check adding one attachment
   info_->AttachRenderbuffer(GL_COLOR_ATTACHMENT0, rb_info1);
   EXPECT_TRUE(info_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_TRUE(info_->IsNotComplete());
-  EXPECT_EQ(static_cast<GLenum>(GL_RGBA4), info_->GetColorAttachmentFormat());
-  EXPECT_FALSE(info_->HasDepthAttachment());
-  EXPECT_FALSE(info_->HasStencilAttachment());
-
-  rb_info1->SetInfo(1, GL_RGB, 0, 0);
-  EXPECT_EQ(static_cast<GLenum>(GL_RGB), info_->GetColorAttachmentFormat());
-  EXPECT_FALSE(info_->HasDepthAttachment());
-  EXPECT_FALSE(info_->HasStencilAttachment());
 
   // check adding another
   info_->AttachRenderbuffer(GL_DEPTH_ATTACHMENT, rb_info1);
   EXPECT_TRUE(info_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_TRUE(info_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_TRUE(info_->IsNotComplete());
-  EXPECT_EQ(static_cast<GLenum>(GL_RGB), info_->GetColorAttachmentFormat());
-  EXPECT_TRUE(info_->HasDepthAttachment());
-  EXPECT_FALSE(info_->HasStencilAttachment());
 
   // check marking them as cleared.
   info_->MarkAttachedRenderbuffersAsCleared();
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_TRUE(info_->IsNotComplete());
 
   // Check adding one that is already cleared.
   info_->AttachRenderbuffer(GL_STENCIL_ATTACHMENT, rb_info1);
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
-  EXPECT_EQ(static_cast<GLenum>(GL_RGB), info_->GetColorAttachmentFormat());
-  EXPECT_TRUE(info_->HasDepthAttachment());
-  EXPECT_TRUE(info_->HasStencilAttachment());
 
   // Check marking the renderbuffer as unclared.
   rb_info1->SetInfo(kSamples1, kFormat1, kWidth1, kHeight1);
   EXPECT_FALSE(info_->IsNotComplete());
-  EXPECT_EQ(static_cast<GLenum>(kFormat1), info_->GetColorAttachmentFormat());
-  EXPECT_TRUE(info_->HasDepthAttachment());
-  EXPECT_TRUE(info_->HasStencilAttachment());
 
   const FramebufferManager::FramebufferInfo::Attachment* attachment =
       info_->GetAttachment(GL_COLOR_ATTACHMENT0);
   ASSERT_TRUE(attachment != NULL);
   EXPECT_EQ(kWidth1, attachment->width());
   EXPECT_EQ(kHeight1, attachment->height());
   EXPECT_EQ(kSamples1, attachment->samples());
   EXPECT_EQ(kFormat1, attachment->internal_format());
   EXPECT_FALSE(attachment->cleared());
 
@@ skipping 29 matching lines @@
   ASSERT_TRUE(attachment != NULL);
   EXPECT_EQ(kWidth3, attachment->width());
   EXPECT_EQ(kHeight3, attachment->height());
   EXPECT_EQ(kSamples3, attachment->samples());
   EXPECT_EQ(kFormat3, attachment->internal_format());
   EXPECT_FALSE(attachment->cleared());
 
   // Check removing it.
   info_->AttachRenderbuffer(GL_STENCIL_ATTACHMENT, NULL);
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
-  EXPECT_EQ(static_cast<GLenum>(kFormat1), info_->GetColorAttachmentFormat());
-  EXPECT_TRUE(info_->HasDepthAttachment());
-  EXPECT_FALSE(info_->HasStencilAttachment());
 
   rb_manager.Destroy(false);
 }
 
 TEST_F(FramebufferInfoTest, AttachTexture) {
   const GLuint kTextureClient1Id = 33;
   const GLuint kTextureService1Id = 333;
   const GLuint kTextureClient2Id = 34;
   const GLuint kTextureService2Id = 334;
   const GLint kMaxTextureSize = 128;
@@ skipping 28 matching lines @@
   tex_manager.CreateTextureInfo(
       &feature_info, kTextureClient1Id, kTextureService1Id);
   TextureManager::TextureInfo* tex_info1 =
       tex_manager.GetTextureInfo(kTextureClient1Id);
   ASSERT_TRUE(tex_info1 != NULL);
 
   // check adding one attachment
   info_->AttachTexture(GL_COLOR_ATTACHMENT0, tex_info1, kTarget1, kLevel1);
   EXPECT_FALSE(info_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_TRUE(info_->IsNotComplete());
-  EXPECT_EQ(static_cast<GLenum>(0), info_->GetColorAttachmentFormat());
 
   tex_manager.SetInfoTarget(tex_info1, GL_TEXTURE_2D);
   tex_manager.SetLevelInfo(
       &feature_info, tex_info1, GL_TEXTURE_2D, kLevel1,
       kFormat1, kWidth1, kHeight1, kDepth, kBorder, kFormat1, kType);
   EXPECT_FALSE(info_->IsNotComplete());
-  EXPECT_EQ(static_cast<GLenum>(kFormat1), info_->GetColorAttachmentFormat());
 
   const FramebufferManager::FramebufferInfo::Attachment* attachment =
       info_->GetAttachment(GL_COLOR_ATTACHMENT0);
   ASSERT_TRUE(attachment != NULL);
   EXPECT_EQ(kWidth1, attachment->width());
   EXPECT_EQ(kHeight1, attachment->height());
   EXPECT_EQ(kSamples1, attachment->samples());
   EXPECT_EQ(kFormat1, attachment->internal_format());
   EXPECT_TRUE(attachment->cleared());
 
   // Check replacing an attachment
   tex_manager.CreateTextureInfo(
       &feature_info, kTextureClient2Id, kTextureService2Id);
   TextureManager::TextureInfo* tex_info2 =
       tex_manager.GetTextureInfo(kTextureClient2Id);
   ASSERT_TRUE(tex_info2 != NULL);
   tex_manager.SetInfoTarget(tex_info2, GL_TEXTURE_2D);
   tex_manager.SetLevelInfo(
       &feature_info, tex_info2, GL_TEXTURE_2D, kLevel2,
       kFormat2, kWidth2, kHeight2, kDepth, kBorder, kFormat2, kType);
 
   info_->AttachTexture(GL_COLOR_ATTACHMENT0, tex_info2, kTarget2, kLevel2);
-  EXPECT_EQ(static_cast<GLenum>(kFormat2), info_->GetColorAttachmentFormat());
 
   attachment = info_->GetAttachment(GL_COLOR_ATTACHMENT0);
   ASSERT_TRUE(attachment != NULL);
   EXPECT_EQ(kWidth2, attachment->width());
   EXPECT_EQ(kHeight2, attachment->height());
   EXPECT_EQ(kSamples2, attachment->samples());
   EXPECT_EQ(kFormat2, attachment->internal_format());
   EXPECT_TRUE(attachment->cleared());
 
   // Check changing attachment
   tex_manager.SetLevelInfo(
       &feature_info, tex_info2, GL_TEXTURE_2D, kLevel3,
       kFormat3, kWidth3, kHeight3, kDepth, kBorder, kFormat3, kType);
   attachment = info_->GetAttachment(GL_COLOR_ATTACHMENT0);
   ASSERT_TRUE(attachment != NULL);
   EXPECT_EQ(kWidth3, attachment->width());
   EXPECT_EQ(kHeight3, attachment->height());
   EXPECT_EQ(kSamples3, attachment->samples());
   EXPECT_EQ(kFormat3, attachment->internal_format());
   EXPECT_TRUE(attachment->cleared());
-  EXPECT_EQ(static_cast<GLenum>(kFormat3), info_->GetColorAttachmentFormat());
 
   // Check removing it.
   info_->AttachTexture(GL_COLOR_ATTACHMENT0, NULL, 0, 0);
   EXPECT_TRUE(info_->GetAttachment(GL_COLOR_ATTACHMENT0) == NULL);
-  EXPECT_EQ(static_cast<GLenum>(0), info_->GetColorAttachmentFormat());
 
   tex_manager.Destroy(false);
 }
 
 }  // namespace gles2
 }  // namespace gpu