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

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

Issue 11779023: Aura: A little lighter GL synchronization (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Bind the textures because client side expects it. Created 7 years, 11 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 | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index b60c917a9cb6bfb02e0f777b880e2440306bb808..3962311c6aadc5b272795a9bfcc599ea8f3fe951 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -7259,26 +7259,13 @@ TEST_F(GLES2DecoderTest, ProduceAndConsumeTextureCHROMIUM) {
group().texture_manager()->GetTextureInfo(client_texture_id_);
EXPECT_EQ(kServiceTextureId, info->service_id());
- // Assigns and binds new service side texture ID and applies the texture
- // objects' state to it.
+ // Assigns and binds new service side texture ID.
EXPECT_CALL(*gl_, GenTextures(1, _))
.WillOnce(SetArgumentPointee<1>(kNewServiceId))
.RetiresOnSaturation();
EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_2D, kNewServiceId))
.Times(1)
.RetiresOnSaturation();
- EXPECT_CALL(*gl_, TexParameteri(GL_TEXTURE_2D,
- GL_TEXTURE_MIN_FILTER,
- GL_NEAREST_MIPMAP_LINEAR));
- EXPECT_CALL(*gl_, TexParameteri(GL_TEXTURE_2D,
- GL_TEXTURE_MAG_FILTER,
- GL_LINEAR));
- EXPECT_CALL(*gl_, TexParameteri(GL_TEXTURE_2D,
- GL_TEXTURE_WRAP_S,
- GL_REPEAT));
- EXPECT_CALL(*gl_, TexParameteri(GL_TEXTURE_2D,
- GL_TEXTURE_WRAP_T,
- GL_REPEAT));
ProduceTextureCHROMIUM produce_cmd;
produce_cmd.Init(GL_TEXTURE_2D, kSharedMemoryId, kSharedMemoryOffset);
@@ -7307,26 +7294,13 @@ TEST_F(GLES2DecoderTest, ProduceAndConsumeTextureCHROMIUM) {
// Service ID has changed.
EXPECT_EQ(kNewServiceId, info->service_id());
- // Assigns and binds original service side texture ID and applies the texture
- // objects' state to it.
+ // Assigns and binds original service size texture ID.
EXPECT_CALL(*gl_, DeleteTextures(1, _))
.Times(1)
.RetiresOnSaturation();
EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_2D, kServiceTextureId))
.Times(1)
.RetiresOnSaturation();
- EXPECT_CALL(*gl_, TexParameteri(GL_TEXTURE_2D,
- GL_TEXTURE_MIN_FILTER,
- GL_NEAREST_MIPMAP_LINEAR));
- EXPECT_CALL(*gl_, TexParameteri(GL_TEXTURE_2D,
- GL_TEXTURE_MAG_FILTER,
- GL_LINEAR));
- EXPECT_CALL(*gl_, TexParameteri(GL_TEXTURE_2D,
- GL_TEXTURE_WRAP_S,
- GL_REPEAT));
- EXPECT_CALL(*gl_, TexParameteri(GL_TEXTURE_2D,
- GL_TEXTURE_WRAP_T,
- GL_REPEAT));
ConsumeTextureCHROMIUM consume_cmd;
consume_cmd.Init(GL_TEXTURE_2D, kSharedMemoryId, kSharedMemoryOffset);
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698