gpu: Use a rectangle to keep track of the cleared area of each texture level.

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 "gpu/command_buffer/service/error_state_mock.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/test_helper.h"
@@ skipping 428 matching lines @@
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture1.get(), kTarget1, kLevel1, kSamples1);
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
             framebuffer_->IsPossiblyComplete());
   EXPECT_TRUE(framebuffer_->IsCleared());
   EXPECT_EQ(static_cast<GLenum>(0), framebuffer_->GetColorAttachmentFormat());
 
   // Try format that doesn't work with COLOR_ATTACHMENT0
   texture_manager_->SetTarget(texture1.get(), GL_TEXTURE_2D);
-  texture_manager_->SetLevelInfo(texture1.get(),
-                                GL_TEXTURE_2D,
-                                kLevel1,
-                                kBadFormat1,
-                                kWidth1,
-                                kHeight1,
-                                kDepth,
-                                kBorder,
-                                kBadFormat1,
-                                kType,
-                                true);
+  texture_manager_->SetLevelInfo(
+      texture1.get(), GL_TEXTURE_2D, kLevel1, kBadFormat1, kWidth1, kHeight1,
+      kDepth, kBorder, kBadFormat1, kType, gfx::Rect(kWidth1, kHeight1));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
             framebuffer_->IsPossiblyComplete());
 
   // Try a good format.
-  texture_manager_->SetLevelInfo(texture1.get(),
-                                GL_TEXTURE_2D,
-                                kLevel1,
-                                kFormat1,
-                                kWidth1,
-                                kHeight1,
-                                kDepth,
-                                kBorder,
-                                kFormat1,
-                                kType,
-                                false);
+  texture_manager_->SetLevelInfo(texture1.get(), GL_TEXTURE_2D, kLevel1,
+                                 kFormat1, kWidth1, kHeight1, kDepth, kBorder,
+                                 kFormat1, kType, gfx::Rect());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete());
   EXPECT_FALSE(framebuffer_->IsCleared());
-  texture_manager_->SetLevelInfo(texture1.get(),
-                                GL_TEXTURE_2D,
-                                kLevel1,
-                                kFormat1,
-                                kWidth1,
-                                kHeight1,
-                                kDepth,
-                                kBorder,
-                                kFormat1,
-                                kType,
-                                true);
+  texture_manager_->SetLevelInfo(texture1.get(), GL_TEXTURE_2D, kLevel1,
+                                 kFormat1, kWidth1, kHeight1, kDepth, kBorder,
+                                 kFormat1, kType, gfx::Rect(kWidth1, kHeight1));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete());
   EXPECT_TRUE(framebuffer_->IsCleared());
   EXPECT_EQ(static_cast<GLenum>(kFormat1),
             framebuffer_->GetColorAttachmentFormat());
 
   const Framebuffer::Attachment* attachment =
       framebuffer_->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
   texture_manager_->CreateTexture(kTextureClient2Id, kTextureService2Id);
   scoped_refptr<TextureRef> texture2(
       texture_manager_->GetTexture(kTextureClient2Id));
   ASSERT_TRUE(texture2.get() != NULL);
   texture_manager_->SetTarget(texture2.get(), GL_TEXTURE_2D);
-  texture_manager_->SetLevelInfo(texture2.get(),
-                                GL_TEXTURE_2D,
-                                kLevel2,
-                                kFormat2,
-                                kWidth2,
-                                kHeight2,
-                                kDepth,
-                                kBorder,
-                                kFormat2,
-                                kType,
-                                true);
+  texture_manager_->SetLevelInfo(texture2.get(), GL_TEXTURE_2D, kLevel2,
+                                 kFormat2, kWidth2, kHeight2, kDepth, kBorder,
+                                 kFormat2, kType, gfx::Rect(kWidth2, kHeight2));
 
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture2.get(), kTarget2, kLevel2, kSamples2);
   EXPECT_EQ(static_cast<GLenum>(kFormat2),
             framebuffer_->GetColorAttachmentFormat());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete());
   EXPECT_TRUE(framebuffer_->IsCleared());
 
   attachment = framebuffer_->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
-  texture_manager_->SetLevelInfo(texture2.get(),
-                                GL_TEXTURE_2D,
-                                kLevel3,
-                                kFormat3,
-                                kWidth3,
-                                kHeight3,
-                                kDepth,
-                                kBorder,
-                                kFormat3,
-                                kType,
-                                false);
+  texture_manager_->SetLevelInfo(texture2.get(), GL_TEXTURE_2D, kLevel3,
+                                 kFormat3, kWidth3, kHeight3, kDepth, kBorder,
+                                 kFormat3, kType, gfx::Rect());
   attachment = framebuffer_->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_FALSE(attachment->cleared());
   EXPECT_EQ(static_cast<GLenum>(kFormat3),
             framebuffer_->GetColorAttachmentFormat());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete());
   EXPECT_FALSE(framebuffer_->IsCleared());
 
   // Set to size 0
-  texture_manager_->SetLevelInfo(texture2.get(),
-                                GL_TEXTURE_2D,
-                                kLevel3,
-                                kFormat3,
-                                0,
-                                0,
-                                kDepth,
-                                kBorder,
-                                kFormat3,
-                                kType,
-                                false);
+  texture_manager_->SetLevelInfo(texture2.get(), GL_TEXTURE_2D, kLevel3,
+                                 kFormat3, 0, 0, kDepth, kBorder, kFormat3,
+                                 kType, gfx::Rect());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
             framebuffer_->IsPossiblyComplete());
 
   // Check removing it.
   framebuffer_->AttachTexture(GL_COLOR_ATTACHMENT0, NULL, 0, 0, 0);
   EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) == NULL);
   EXPECT_EQ(static_cast<GLenum>(0), framebuffer_->GetColorAttachmentFormat());
 
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT),
             framebuffer_->IsPossiblyComplete());
@@ skipping 35 matching lines @@
     ASSERT_TRUE(attachment != NULL);
     EXPECT_TRUE(attachment->cleared());
   }
   EXPECT_TRUE(framebuffer_->IsCleared());
   EXPECT_FALSE(framebuffer_->HasUnclearedColorAttachments());
 
   // Set a texture as uncleared.
   scoped_refptr<TextureRef> texture1(
       texture_manager_->GetTexture(kTextureClientId[1]));
   texture_manager_->SetTarget(texture1.get(), GL_TEXTURE_2D);
-  texture_manager_->SetLevelInfo(
-      texture1.get(), GL_TEXTURE_2D, 0, GL_RGBA, 4, 4,
-      1, 0, GL_RGBA, GL_UNSIGNED_BYTE, false);
+  texture_manager_->SetLevelInfo(texture1.get(), GL_TEXTURE_2D, 0, GL_RGBA, 4,
+                                 4, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+                                 gfx::Rect());
 
   const Framebuffer::Attachment* attachment1 =
       framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT1);
   ASSERT_TRUE(attachment1 != NULL);
   EXPECT_FALSE(attachment1->cleared());
   EXPECT_FALSE(framebuffer_->IsCleared());
   EXPECT_TRUE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT1));
   EXPECT_TRUE(framebuffer_->HasUnclearedColorAttachments());
 
   GLenum buffers[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 };
@@ skipping 69 matching lines @@
   texture_manager_->CreateTexture(kTextureClientId, kTextureServiceId);
   scoped_refptr<TextureRef> texture(
       texture_manager_->GetTexture(kTextureClientId));
   ASSERT_TRUE(texture.get() != NULL);
 
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture.get(), kTarget, kLevel, kSamples);
   EXPECT_EQ(static_cast<GLenum>(0), framebuffer_->GetColorAttachmentFormat());
 
   texture_manager_->SetTarget(texture.get(), GL_TEXTURE_2D);
-  texture_manager_->SetLevelInfo(texture.get(),
-                                GL_TEXTURE_2D,
-                                kLevel,
-                                kInternalFormat,
-                                kWidth,
-                                kHeight,
-                                kDepth,
-                                kBorder,
-                                kFormat,
-                                kType,
-                                false);
+  texture_manager_->SetLevelInfo(texture.get(), GL_TEXTURE_2D, kLevel,
+                                 kInternalFormat, kWidth, kHeight, kDepth,
+                                 kBorder, kFormat, kType, gfx::Rect());
   // Texture with a sized float internalformat is allowed as an attachment
   // since float color attachment extension is present.
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete());
 }
 
 TEST_F(FramebufferInfoTest, UnbindRenderbuffer) {
   const GLuint kRenderbufferClient1Id = 33;
   const GLuint kRenderbufferService1Id = 333;
   const GLuint kRenderbufferClient2Id = 34;
@@ skipping 230 matching lines @@
         .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
         .RetiresOnSaturation();
   }
   framebuffer_->GetStatus(texture_manager_.get(), GL_READ_FRAMEBUFFER);
 }
 
 }  // namespace gles2
 }  // namespace gpu