Index: gpu/command_buffer/service/texture_manager_unittest.cc |
=================================================================== |
--- gpu/command_buffer/service/texture_manager_unittest.cc (revision 113223) |
+++ gpu/command_buffer/service/texture_manager_unittest.cc (working copy) |
@@ -373,7 +373,7 @@ |
EXPECT_TRUE(info_->CanGenerateMipmaps(&feature_info_)); |
// Make mips. |
- EXPECT_TRUE(manager_.MarkMipmapsGenerated(&feature_info_, info_, true)); |
+ EXPECT_TRUE(manager_.MarkMipmapsGenerated(&feature_info_, info_)); |
EXPECT_TRUE(info_->texture_complete()); |
EXPECT_TRUE(info_->CanRender(&feature_info_)); |
EXPECT_FALSE(manager_.HaveUnrenderableTextures()); |
@@ -390,7 +390,7 @@ |
GL_TEXTURE_2D, 3, GL_RGBA, 4, 4, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, true); |
EXPECT_TRUE(info_->CanGenerateMipmaps(&feature_info_)); |
// Make mips. |
- EXPECT_TRUE(manager_.MarkMipmapsGenerated(&feature_info_, info_, true)); |
+ EXPECT_TRUE(manager_.MarkMipmapsGenerated(&feature_info_, info_)); |
EXPECT_TRUE(info_->CanRender(&feature_info_)); |
EXPECT_TRUE(info_->texture_complete()); |
EXPECT_FALSE(manager_.HaveUnrenderableTextures()); |
@@ -402,7 +402,7 @@ |
// Set level zero to large size. |
manager_.SetLevelInfo(&feature_info_, info_, |
GL_TEXTURE_2D, 0, GL_RGBA, 4, 4, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, true); |
- EXPECT_TRUE(manager_.MarkMipmapsGenerated(&feature_info_, info_, true)); |
+ EXPECT_TRUE(manager_.MarkMipmapsGenerated(&feature_info_, info_)); |
EXPECT_FALSE(info_->npot()); |
EXPECT_TRUE(info_->texture_complete()); |
EXPECT_TRUE(info_->CanRender(&feature_info_)); |
@@ -410,7 +410,7 @@ |
// Set level zero to large smaller (levels unused mips) |
manager_.SetLevelInfo(&feature_info_, info_, |
GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, true); |
- EXPECT_TRUE(manager_.MarkMipmapsGenerated(&feature_info_, info_, true)); |
+ EXPECT_TRUE(manager_.MarkMipmapsGenerated(&feature_info_, info_)); |
EXPECT_FALSE(info_->npot()); |
EXPECT_TRUE(info_->texture_complete()); |
EXPECT_TRUE(info_->CanRender(&feature_info_)); |
@@ -476,7 +476,7 @@ |
EXPECT_TRUE(info->CanGenerateMipmaps(&feature_info)); |
EXPECT_FALSE(info->CanRender(&feature_info)); |
EXPECT_TRUE(manager.HaveUnrenderableTextures()); |
- EXPECT_TRUE(manager.MarkMipmapsGenerated(&feature_info, info, true)); |
+ EXPECT_TRUE(manager.MarkMipmapsGenerated(&feature_info, info)); |
EXPECT_TRUE(info->texture_complete()); |
EXPECT_TRUE(info->CanRender(&feature_info)); |
EXPECT_FALSE(manager.HaveUnrenderableTextures()); |
@@ -543,7 +543,7 @@ |
EXPECT_TRUE(manager_.HaveUnrenderableTextures()); |
// Make mips. |
- EXPECT_TRUE(manager_.MarkMipmapsGenerated(&feature_info_, info_, true)); |
+ EXPECT_TRUE(manager_.MarkMipmapsGenerated(&feature_info_, info_)); |
EXPECT_TRUE(info_->texture_complete()); |
EXPECT_TRUE(info_->cube_complete()); |
EXPECT_TRUE(info_->CanRender(&feature_info_)); |
@@ -563,7 +563,7 @@ |
3, GL_RGBA, 4, 4, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, true); |
EXPECT_TRUE(info_->CanGenerateMipmaps(&feature_info_)); |
// Make mips. |
- EXPECT_TRUE(manager_.MarkMipmapsGenerated(&feature_info_, info_, true)); |
+ EXPECT_TRUE(manager_.MarkMipmapsGenerated(&feature_info_, info_)); |
EXPECT_TRUE(info_->texture_complete()); |
EXPECT_TRUE(info_->cube_complete()); |
} |
@@ -797,7 +797,7 @@ |
EXPECT_TRUE(manager_.HaveUnsafeTextures()); |
EXPECT_TRUE(manager_.HaveUnclearedMips()); |
EXPECT_EQ(1, info_->num_uncleared_mips()); |
- manager_.MarkMipmapsGenerated(&feature_info_, info_, true); |
+ manager_.MarkMipmapsGenerated(&feature_info_, info_); |
EXPECT_TRUE(info_->SafeToRenderFrom()); |
EXPECT_FALSE(manager_.HaveUnsafeTextures()); |
EXPECT_FALSE(manager_.HaveUnclearedMips()); |
@@ -857,7 +857,7 @@ |
TEST_F(TextureInfoTest, ClearTexture) { |
scoped_ptr<MockGLES2Decoder> decoder(new gles2::MockGLES2Decoder()); |
- EXPECT_CALL(*decoder, ClearLevel(_, _, _, _, _, _, _, _)) |
+ EXPECT_CALL(*decoder, ClearLevel(_, _, _, _, _, _, _, _, _)) |
.WillRepeatedly(Return(true)); |
manager_.SetInfoTarget(&feature_info_, info_, GL_TEXTURE_2D); |
manager_.SetLevelInfo(&feature_info_, info_, |