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

gpu/command_buffer/service/mailbox_manager_unittest.cc

 // Copyright 2013 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/feature_info.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/mailbox_manager_impl.h"
 #include "gpu/command_buffer/service/mailbox_manager_sync.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 29 matching lines @@
   void TearDown() override { GpuServiceTest::TearDown(); }
 
   Texture* CreateTexture() {
     return new Texture(1);
   }
 
   void SetTarget(Texture* texture, GLenum target, GLuint max_level) {
     texture->SetTarget(NULL, target, max_level);
   }
 
-  void SetLevelInfo(
-      Texture* texture,
-      GLenum target,
-      GLint level,
-      GLenum internal_format,
-      GLsizei width,
-      GLsizei height,
-      GLsizei depth,
-      GLint border,
-      GLenum format,
-      GLenum type,
-      bool cleared) {
-    texture->SetLevelInfo(NULL,
-                          target,
-                          level,
-                          internal_format,
-                          width,
-                          height,
-                          depth,
-                          border,
-                          format,
-                          type,
-                          cleared);
+  void SetLevelInfo(Texture* texture,
+                    GLenum target,
+                    GLint level,
+                    GLenum internal_format,
+                    GLsizei width,
+                    GLsizei height,
+                    GLsizei depth,
+                    GLint border,
+                    GLenum format,
+                    GLenum type,
+                    const gfx::Rect& cleared_rect) {
+    texture->SetLevelInfo(NULL, target, level, internal_format, width, height,
+                          depth, border, format, type, cleared_rect);
   }
 
   void SetLevelCleared(Texture* texture,
                        GLenum target,
                        GLint level,
                        bool cleared) {
     texture->SetLevelCleared(target, level, cleared);
   }
 
   GLenum SetParameter(Texture* texture, GLenum pname, GLint param) {
@@ skipping 121 matching lines @@
     context_ = new gfx::GLContextStub();
     surface_ = new gfx::GLSurfaceStub();
     context_->MakeCurrent(surface_.get());
   }
 
   Texture* DefineTexture() {
     Texture* texture = CreateTexture();
     const GLsizei levels_needed = TextureManager::ComputeMipMapCount(
         GL_TEXTURE_2D, kMaxTextureWidth, kMaxTextureHeight, kMaxTextureDepth);
     SetTarget(texture, GL_TEXTURE_2D, levels_needed);
-    SetLevelInfo(texture,
-                 GL_TEXTURE_2D,
-                 0,
-                 GL_RGBA,
-                 1,
-                 1,
-                 1,
-                 0,
-                 GL_RGBA,
-                 GL_UNSIGNED_BYTE,
-                 true);
+    SetLevelInfo(texture, GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 1, 0, GL_RGBA,
+                 GL_UNSIGNED_BYTE, gfx::Rect(1, 1));
     SetParameter(texture, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     SetParameter(texture, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     return texture;
   }
 
   void SetupUpdateTexParamExpectations(GLuint texture_id,
                                        GLenum min,
                                        GLenum mag,
                                        GLenum wrap_s,
                                        GLenum wrap_t) {
@@ skipping 110 matching lines @@
   EXPECT_CALL(*gl_, GenTextures(1, _))
       .WillOnce(SetArgPointee<1>(kNewTextureId));
   SetupUpdateTexParamExpectations(
       kNewTextureId, GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT);
   Texture* new_texture = manager2_->ConsumeTexture(name);
   EXPECT_FALSE(new_texture == NULL);
   EXPECT_NE(texture, new_texture);
   EXPECT_EQ(kNewTextureId, new_texture->service_id());
 
   // Resize original texture
-  SetLevelInfo(texture,
-               GL_TEXTURE_2D,
-               0,
-               GL_RGBA,
-               16,
-               32,
-               1,
-               0,
-               GL_RGBA,
-               GL_UNSIGNED_BYTE,
-               true);
+  SetLevelInfo(texture, GL_TEXTURE_2D, 0, GL_RGBA, 16, 32, 1, 0, GL_RGBA,
+               GL_UNSIGNED_BYTE, gfx::Rect(16, 32));
   // Should have been orphaned
   EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);
 
   // Synchronize again
   manager_->PushTextureUpdates(0);
   SetupUpdateTexParamExpectations(
       kNewTextureId, GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT);
   manager2_->PullTextureUpdates(0);
   GLsizei width, height;
   new_texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height, nullptr);
   EXPECT_EQ(16, width);
   EXPECT_EQ(32, height);
 
   // Should have gotten a new attachment
   EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) != NULL);
   // Resize original texture again....
-  SetLevelInfo(texture,
-               GL_TEXTURE_2D,
-               0,
-               GL_RGBA,
-               64,
-               64,
-               1,
-               0,
-               GL_RGBA,
-               GL_UNSIGNED_BYTE,
-               true);
+  SetLevelInfo(texture, GL_TEXTURE_2D, 0, GL_RGBA, 64, 64, 1, 0, GL_RGBA,
+               GL_UNSIGNED_BYTE, gfx::Rect(64, 64));
   // ...and immediately delete the texture which should save the changes.
   SetupUpdateTexParamExpectations(
       kNewTextureId, GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT);
   DestroyTexture(texture);
 
   // Should be still around since there is a ref from manager2
   EXPECT_EQ(new_texture, manager2_->ConsumeTexture(name));
 
   // The last change to the texture should be visible without a sync point (i.e.
   // push).
@@ skipping 214 matching lines @@
   SetupUpdateTexParamExpectations(kNewTextureId, texture->min_filter(),
                                   texture->mag_filter(), texture->wrap_s(),
                                   texture->wrap_t());
   Texture* new_texture = manager2_->ConsumeTexture(name);
   ASSERT_TRUE(new_texture);
   EXPECT_NE(texture, new_texture);
   EXPECT_EQ(kNewTextureId, new_texture->service_id());
   EXPECT_FALSE(new_texture->IsDefined());
 
   // Change cleared to false.
-  SetLevelInfo(texture,
-               GL_TEXTURE_2D,
-               0,
-               GL_RGBA,
-               1,
-               1,
-               1,
-               0,
-               GL_RGBA,
-               GL_UNSIGNED_BYTE,
-               true);
+  SetLevelInfo(texture, GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 1, 0, GL_RGBA,
+               GL_UNSIGNED_BYTE, gfx::Rect(1, 1));
   SetParameter(texture, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   SetParameter(texture, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   EXPECT_TRUE(texture->IsDefined());
 
   // Synchronize
   manager_->PushTextureUpdates(0);
   SetupUpdateTexParamExpectations(
       kNewTextureId, GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT);
   manager2_->PullTextureUpdates(0);
 
@@ skipping 82 matching lines @@
   DestroyTexture(texture2);
   DestroyTexture(new_texture);
 }
 
 // TODO: Texture::level_infos_[][].size()
 
 // TODO: unsupported targets and formats
 
 }  // namespace gles2
 }  // namespace gpu