gpu/command_buffer/service/framebuffer_manager_unittest.cc - Issue 1154053002: gpu: Use a rectangle to keep track of the cleared area of each texture level.

Unified Diff: gpu/command_buffer/service/framebuffer_manager_unittest.cc

Issue 1154053002: gpu: Use a rectangle to keep track of the cleared area of each texture level. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: v2 Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/common/gpu/stream_texture_android.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder.h » ('j') | gpu/command_buffer/service/texture_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/framebuffer_manager_unittest.cc

diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc

index e1af82d1059be87d63561312c2dfe4bf30be90d2..5f42390f62d57bde7a0d1a5b8a7364d4e3ecead4 100644

--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc

+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc

@@ -446,46 +446,22 @@ TEST_F(FramebufferInfoTest, AttachTexture) {

// 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());

@@ -507,17 +483,9 @@ TEST_F(FramebufferInfoTest, AttachTexture) {

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);

@@ -536,17 +504,9 @@ TEST_F(FramebufferInfoTest, AttachTexture) {

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());

@@ -561,17 +521,9 @@ TEST_F(FramebufferInfoTest, AttachTexture) {

EXPECT_FALSE(framebuffer_->IsCleared());

// Set to size 0

- texture_manager_->SetLevelInfo(texture2.get(),

- GL_TEXTURE_2D,

- kLevel3,

- kFormat3,

- 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());

@@ -627,9 +579,9 @@ TEST_F(FramebufferInfoTest, DrawBuffers) {

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);

@@ -719,17 +671,9 @@ TEST_F(FramebufferInfoFloatTest, AttachFloatTexture) {

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),