Revert of gpu: Clarify sized texture format is available only if ES3 context or immutable

gpu/command_buffer/service/framebuffer_manager_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include "gpu/command_buffer/service/error_state_mock.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
@@ skipping 117 matching lines @@
                                                         feature_info_.get()));
   }
   ~FramebufferInfoTestBase() override {
     manager_.Destroy(false);
     texture_manager_->Destroy(false);
     renderbuffer_manager_->Destroy(false);
   }
 
  protected:
   void SetUp() override {
-    bool is_es3 = false;
-    if (context_type_ == CONTEXT_TYPE_WEBGL2 ||
-        context_type_ == CONTEXT_TYPE_OPENGLES3)
-      is_es3 = true;
-    InitializeContext(is_es3 ? "3.0" : "2.0", "GL_EXT_framebuffer_object");
+    InitializeContext("2.0", "GL_EXT_framebuffer_object");
   }
 
   void InitializeContext(const char* gl_version, const char* extensions) {
     GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
     TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(),
         extensions, "", gl_version, context_type_);
-    feature_info_->InitializeForTesting(context_type_);
+    feature_info_->InitializeForTesting();
     decoder_.reset(new MockGLES2Decoder());
     manager_.CreateFramebuffer(kClient1Id, kService1Id);
     error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
     framebuffer_ = manager_.GetFramebuffer(kClient1Id);
     ASSERT_TRUE(framebuffer_ != nullptr);
   }
 
   ContextType context_type_;
   FramebufferManager manager_;
   Framebuffer* framebuffer_;
@@ skipping 327 matching lines @@
   const GLsizei kSamples1 = 0;
   const GLsizei kWidth2 = 16;
   const GLsizei kHeight2 = 32;
   const GLint kLevel2 = 0;
   const GLenum kFormat2 = GL_RGB;
   const GLenum kTarget2 = GL_TEXTURE_2D;
   const GLsizei kSamples2 = 0;
   const GLsizei kWidth3 = 75;
   const GLsizei kHeight3 = 123;
   const GLint kLevel3 = 0;
-  const GLenum kFormat3 = GL_RGBA;
+  const GLenum kFormat3 = GL_RGB565;
   const GLsizei kSamples3 = 0;
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
 
   texture_manager_->CreateTexture(kTextureClient1Id, kTextureService1Id);
   scoped_refptr<TextureRef> texture1(
       texture_manager_->GetTexture(kTextureClient1Id));
@@ skipping 767 matching lines @@
       .RetiresOnSaturation();
   EXPECT_TRUE(
       framebuffer_->ValidateAndAdjustDrawBuffers(0x310u, 0x330u));
   // Call it a second time - making sure DrawBuffers isn't triggered.
   EXPECT_CALL(*gl_, DrawBuffersARB(kMaxDrawBuffers, _))
       .Times(0);
   EXPECT_TRUE(
       framebuffer_->ValidateAndAdjustDrawBuffers(0x310u, 0x330u));
 }
 
-class FramebufferInfoFloatTest : public FramebufferInfoTestBase {
+class FramebufferInfoFloatTest : public FramebufferInfoTest {
  public:
   FramebufferInfoFloatTest()
-      : FramebufferInfoTestBase(CONTEXT_TYPE_OPENGLES2) {}
+    : FramebufferInfoTest() {
+  }
   ~FramebufferInfoFloatTest() override {}
 
  protected:
   void SetUp() override {
     InitializeContext("OpenGL ES 3.0",
         "GL_OES_texture_float GL_EXT_color_buffer_float");
   }
 };
 
 TEST_F(FramebufferInfoFloatTest, AttachFloatTexture) {
@@ skipping 244 matching lines @@
 }
 
 class FramebufferInfoES3Test : public FramebufferInfoTestBase {
  public:
   FramebufferInfoES3Test() : FramebufferInfoTestBase(CONTEXT_TYPE_WEBGL2) {}
 
  protected:
   void SetUp() override {
     InitializeContext("OpenGL ES 3.0", "");
   }
+
+  void InitializeContext(const char* gl_version, const char* extensions) {
+    GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
+    TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(),
+        extensions, "", gl_version, context_type_);
+    feature_info_->InitializeForTesting(CONTEXT_TYPE_OPENGLES3);
+    decoder_.reset(new MockGLES2Decoder());
+    manager_.CreateFramebuffer(kClient1Id, kService1Id);
+    error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
+    framebuffer_ = manager_.GetFramebuffer(kClient1Id);
+    ASSERT_TRUE(framebuffer_ != nullptr);
+  }
 };
 
 TEST_F(FramebufferInfoES3Test, DifferentDimensions) {
   const GLuint kRenderbufferClient1Id = 33;
   const GLuint kRenderbufferService1Id = 333;
   const GLuint kRenderbufferClient2Id = 34;
   const GLuint kRenderbufferService2Id = 334;
   const GLsizei kWidth1 = 16;
   const GLsizei kHeight1 = 32;
   const GLenum kFormat1 = GL_RGBA4;
@@ skipping 80 matching lines @@
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId);
   ASSERT_TRUE(renderbuffer != nullptr);
   framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer);
   EXPECT_TRUE(framebuffer_->GetReadBufferAttachment());
 }
 
 }  // namespace gles2
 }  // namespace gpu