diff options
Diffstat (limited to 'gpu/command_buffer/service/texture_manager_unittest.cc')
| -rw-r--r-- | gpu/command_buffer/service/texture_manager_unittest.cc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc index 516f478..90e90c4 100644 --- a/gpu/command_buffer/service/texture_manager_unittest.cc +++ b/gpu/command_buffer/service/texture_manager_unittest.cc @@ -1391,15 +1391,12 @@ TEST_F(TextureTest, GetLevelImage) { EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 1) == NULL); // Set image. scoped_refptr<gfx::GLImage> image(new gfx::GLImageStub); - manager_->SetLevelImage(texture_ref_.get(), GL_TEXTURE_2D, 1, image.get(), - Texture::BOUND); + manager_->SetLevelImage(texture_ref_.get(), GL_TEXTURE_2D, 1, image.get()); EXPECT_FALSE(texture->GetLevelImage(GL_TEXTURE_2D, 1) == NULL); // Remove it. - manager_->SetLevelImage(texture_ref_.get(), GL_TEXTURE_2D, 1, nullptr, - Texture::UNBOUND); + manager_->SetLevelImage(texture_ref_.get(), GL_TEXTURE_2D, 1, NULL); EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 1) == NULL); - manager_->SetLevelImage(texture_ref_.get(), GL_TEXTURE_2D, 1, image.get(), - Texture::UNBOUND); + manager_->SetLevelImage(texture_ref_.get(), GL_TEXTURE_2D, 1, image.get()); // Image should be reset when SetLevelInfo is called. manager_->SetLevelInfo(texture_ref_.get(), GL_TEXTURE_2D, 1, GL_RGBA, 2, 2, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, gfx::Rect(2, 2)); @@ -1740,8 +1737,7 @@ TEST_P(ProduceConsumeTextureTest, ProduceConsumeTextureWithImage) { scoped_refptr<gfx::GLImage> image(new gfx::GLImageStub); manager_->SetLevelInfo(texture_ref_.get(), target, 0, GL_RGBA, 0, 0, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, gfx::Rect()); - manager_->SetLevelImage(texture_ref_.get(), target, 0, image.get(), - Texture::BOUND); + manager_->SetLevelImage(texture_ref_.get(), target, 0, image.get()); GLuint service_id = texture->service_id(); Texture* produced_texture = Produce(texture_ref_.get()); @@ -2061,15 +2057,13 @@ TEST_F(SharedTextureTest, Images) { EXPECT_FALSE(texture_manager1_->HaveImages()); EXPECT_FALSE(texture_manager2_->HaveImages()); scoped_refptr<gfx::GLImage> image1(new gfx::GLImageStub); - texture_manager1_->SetLevelImage(ref1.get(), GL_TEXTURE_2D, 1, image1.get(), - Texture::BOUND); + texture_manager1_->SetLevelImage(ref1.get(), GL_TEXTURE_2D, 1, image1.get()); EXPECT_TRUE(ref1->texture()->HasImages()); EXPECT_TRUE(ref2->texture()->HasImages()); EXPECT_TRUE(texture_manager1_->HaveImages()); EXPECT_TRUE(texture_manager2_->HaveImages()); scoped_refptr<gfx::GLImage> image2(new gfx::GLImageStub); - texture_manager1_->SetLevelImage(ref1.get(), GL_TEXTURE_2D, 1, image2.get(), - Texture::BOUND); + texture_manager1_->SetLevelImage(ref1.get(), GL_TEXTURE_2D, 1, image2.get()); EXPECT_TRUE(ref1->texture()->HasImages()); EXPECT_TRUE(ref2->texture()->HasImages()); EXPECT_TRUE(texture_manager1_->HaveImages()); |