Move special DEPTH_STENCIL attachment logic from command buffers to WebGL1

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 21 matching lines @@
 const GLint kMaxSamples = 4;
 const uint32_t kMaxDrawBuffers = 16;
 const uint32_t kMaxColorAttachments = 16;
 const bool kUseDefaultTextures = false;
 
 }  // namespace
 
 class FramebufferManagerTest : public GpuServiceTest {
  public:
   FramebufferManagerTest()
-      : manager_(1, 1, CONTEXT_TYPE_OPENGLES2, nullptr),
+      : manager_(1, 1, nullptr),
         feature_info_(new FeatureInfo()) {
     texture_manager_.reset(new TextureManager(nullptr,
                                               feature_info_.get(),
                                               kMaxTextureSize,
                                               kMaxCubemapSize,
                                               kMaxRectangleTextureSize,
                                               kMax3DTextureSize,
                                               kMaxArrayTextureLayers,
                                               kUseDefaultTextures));
     renderbuffer_manager_.reset(new RenderbufferManager(nullptr,
@@ skipping 57 matching lines @@
   framebuffer1 = manager_.GetFramebuffer(kClient1Id);
   ASSERT_TRUE(framebuffer1 == nullptr);
 }
 
 class FramebufferInfoTestBase : public GpuServiceTest {
  public:
   static const GLuint kClient1Id = 1;
   static const GLuint kService1Id = 11;
 
   explicit FramebufferInfoTestBase(ContextType context_type)
-      : manager_(kMaxDrawBuffers,
+      : context_type_(context_type),
+        manager_(kMaxDrawBuffers,
                  kMaxColorAttachments,
-                 context_type,
                  new FramebufferCompletenessCache),
         feature_info_(new FeatureInfo()) {
     texture_manager_.reset(new TextureManager(nullptr,
                                               feature_info_.get(),
                                               kMaxTextureSize,
                                               kMaxCubemapSize,
                                               kMaxRectangleTextureSize,
                                               kMax3DTextureSize,
                                               kMaxArrayTextureLayers,
                                               kUseDefaultTextures));
     renderbuffer_manager_.reset(new RenderbufferManager(nullptr,
                                                         kMaxRenderbufferSize,
                                                         kMaxSamples,
                                                         feature_info_.get()));
   }
   ~FramebufferInfoTestBase() override {
     manager_.Destroy(false);
     texture_manager_->Destroy(false);
     renderbuffer_manager_->Destroy(false);
   }
 
  protected:
   void SetUp() override {
     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, manager_.context_type());
+        extensions, "", gl_version, 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_;
   scoped_refptr<FeatureInfo> feature_info_;
   std::unique_ptr<TextureManager> texture_manager_;
   std::unique_ptr<RenderbufferManager> renderbuffer_manager_;
   std::unique_ptr<MockErrorState> error_state_;
   std::unique_ptr<MockGLES2Decoder> decoder_;
 };
 
 class FramebufferInfoTest : public FramebufferInfoTestBase {
  public:
   FramebufferInfoTest() : FramebufferInfoTestBase(CONTEXT_TYPE_OPENGLES2) {}
 };
 
 // GCC requires these declarations, but MSVC requires they not be present
 #ifndef COMPILER_MSVC
 const GLuint FramebufferInfoTestBase::kClient1Id;
 const GLuint FramebufferInfoTestBase::kService1Id;
 #endif
 
 TEST_F(FramebufferInfoTest, Basic) {
   EXPECT_EQ(kService1Id, framebuffer_->service_id());
   EXPECT_FALSE(framebuffer_->IsDeleted());
   EXPECT_TRUE(nullptr == framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_TRUE(nullptr == framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_TRUE(nullptr == framebuffer_->GetAttachment(GL_STENCIL_ATTACHMENT));
-  EXPECT_TRUE(
-      nullptr == framebuffer_->GetAttachment(GL_DEPTH_STENCIL_ATTACHMENT));
   EXPECT_FALSE(framebuffer_->HasDepthAttachment());
   EXPECT_FALSE(framebuffer_->HasStencilAttachment());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_TRUE(framebuffer_->IsCleared());
   EXPECT_EQ(static_cast<GLenum>(0),
             framebuffer_->GetReadBufferInternalFormat());
   EXPECT_FALSE(manager_.IsComplete(framebuffer_));
 }
 
@@ skipping 27 matching lines @@
   const GLsizei kSamples4 = 0;
   const GLsizei kWidth5 = 16;
   const GLsizei kHeight5 = 32;
   const GLenum kFormat5 = GL_DEPTH24_STENCIL8;
   const GLsizei kSamples5 = 0;
   const GLsizei kDifferentSamples5 = 1;
 
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
-  EXPECT_FALSE(
-      framebuffer_->HasUnclearedAttachment(GL_DEPTH_STENCIL_ATTACHMENT));
 
   renderbuffer_manager_->CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
   Renderbuffer* renderbuffer1 =
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient1Id);
   ASSERT_TRUE(renderbuffer1 != nullptr);
 
   // Check adding one attachment.
   framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT0, renderbuffer1);
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
@@ skipping 251 matching lines @@
   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_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_FALSE(
-      framebuffer_->HasUnclearedAttachment(GL_DEPTH_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));
   ASSERT_TRUE(texture1.get() != nullptr);
 
   // check adding one attachment
   framebuffer_->AttachTexture(
@@ skipping 1036 matching lines @@
   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, manager_.context_type());
+        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;
   const GLsizei kSamples1 = 0;
   const GLsizei kWidth2 = 32;  // Different from kWidth1
   const GLsizei kHeight2 = 32;
   const GLenum kFormat2 = GL_DEPTH_COMPONENT16;
   const GLsizei kSamples2 = 0;
 
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
-  EXPECT_FALSE(
-      framebuffer_->HasUnclearedAttachment(GL_DEPTH_STENCIL_ATTACHMENT));
 
   renderbuffer_manager_->CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
   Renderbuffer* renderbuffer1 =
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient1Id);
   ASSERT_TRUE(renderbuffer1 != nullptr);
   renderbuffer_manager_->SetInfo(
       renderbuffer1, kSamples1, kFormat1, kWidth1, kHeight1);
   framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT0, renderbuffer1);
 
@@ skipping 61 matching lines @@
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId);
   ASSERT_TRUE(renderbuffer != nullptr);
   framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer);
   EXPECT_TRUE(framebuffer_->GetReadBufferAttachment());
 }
 
 }  // namespace gles2
 }  // namespace gpu