Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.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
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
index 7d2b36104f146cc4f14a215ce1993bf0208ca53b..af6592b72e5e44430607eef1216770788a93fc0d 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
@@ -2680,8 +2680,8 @@ TEST_P(GLES2DecoderTest, GLImageAttachedAfterClearLevel) {
height, format, type, _))
.Times(1)
.RetiresOnSaturation();
- GetDecoder()->ClearLevel(texture, target, level, format, format, type, width,
- height, false);
+ GetDecoder()->ClearLevel(texture, target, level, format, type, 0, 0, width,
+ height);
EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == image.get());
}
@@ -2895,17 +2895,9 @@ TEST_P(GLES2DecoderManualInitTest, DrawWithGLImageExternal) {
TextureRef* texture_ref = GetTexture(client_texture_id_);
scoped_refptr<MockGLImage> image(new MockGLImage);
group().texture_manager()->SetTarget(texture_ref, GL_TEXTURE_EXTERNAL_OES);
- group().texture_manager()->SetLevelInfo(texture_ref,
- GL_TEXTURE_EXTERNAL_OES,
- 0,
- GL_RGBA,
- 0,
- 0,
- 1,
- 0,
- GL_RGBA,
- GL_UNSIGNED_BYTE,
- true);
+ group().texture_manager()->SetLevelInfo(texture_ref, GL_TEXTURE_EXTERNAL_OES,
+ 0, GL_RGBA, 0, 0, 1, 0, GL_RGBA,
+ GL_UNSIGNED_BYTE, gfx::Rect());
group().texture_manager()->SetLevelImage(
texture_ref, GL_TEXTURE_EXTERNAL_OES, 0, image.get());

Powered by Google App Engine
This is Rietveld 408576698