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

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

Issue 2232743002: Command buffer: CopyTexSubImage3D should clear the 3D texture if it is uncleared (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update webgl 2 expectation Created 4 years, 4 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_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 2495c9aebff6f18c43c6d638034b5380950da7a0..7435b8d8a9013761d907a06ddafc0c95c4d0997e 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
@@ -1368,6 +1368,78 @@ TEST_P(GLES3DecoderTest, CopyTexSubImage3DFeedbackLoopFails) {
EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
}
+TEST_P(GLES3DecoderTest, CopyTexSubImage3DClearTheUncleared3DTexture) {
+ const GLenum kTarget = GL_TEXTURE_3D;
+ const GLint kLevel = 0;
+ const GLint kXoffset = 0;
+ const GLint kYoffset = 0;
+ const GLint kZoffset = 0;
+ const GLint kX = 0;
+ const GLint kY = 0;
+ const GLint kInternalFormat = GL_RGB8;
+ const GLsizei kWidth = 2;
+ const GLsizei kHeight = 2;
+ const GLsizei kDepth = 2;
+ const GLenum kFormat = GL_RGB;
+ const GLenum kType = GL_UNSIGNED_BYTE;
+ const uint32_t kBufferSize = kWidth * kHeight * kDepth * 4;
+
+ DoBindTexture(kTarget, client_texture_id_, kServiceTextureId);
+ DoTexImage3D(kTarget, kLevel, kInternalFormat, kWidth, kHeight, kDepth, 0,
+ kFormat, kType, 0, 0);
+ TextureRef* texture_ref =
+ group().texture_manager()->GetTexture(client_texture_id_);
+ ASSERT_TRUE(texture_ref != NULL);
+ Texture* texture = texture_ref->texture();
+
+ EXPECT_FALSE(texture->SafeToRenderFrom());
+ EXPECT_FALSE(texture->IsLevelCleared(kTarget, kLevel));
+
+ // CopyTexSubImage3D will clear the uncleared texture
+ EXPECT_CALL(*gl_, GenBuffersARB(1, _))
+ .Times(1)
+ .RetiresOnSaturation();
+ EXPECT_CALL(*gl_, BindBuffer(GL_PIXEL_UNPACK_BUFFER, _))
+ .Times(1)
+ .RetiresOnSaturation();
+ EXPECT_CALL(*gl_, BufferData(GL_PIXEL_UNPACK_BUFFER,
+ kBufferSize, _, GL_STATIC_DRAW))
+ .Times(1)
+ .RetiresOnSaturation();
+ EXPECT_CALL(*gl_, BindTexture(kTarget, kServiceTextureId))
+ .Times(1)
+ .RetiresOnSaturation();
+ EXPECT_CALL(*gl_, TexSubImage3DNoData(kTarget, kLevel,
+ kXoffset, kYoffset, kZoffset,
+ kWidth, kHeight, kDepth,
+ kFormat, kType))
+ .Times(1)
+ .RetiresOnSaturation();
+ EXPECT_CALL(*gl_, BindBuffer(GL_PIXEL_UNPACK_BUFFER, _))
+ .Times(1)
+ .RetiresOnSaturation();
+ EXPECT_CALL(*gl_, DeleteBuffersARB(1, _))
+ .Times(1)
+ .RetiresOnSaturation();
+ EXPECT_CALL(*gl_, BindTexture(kTarget, _))
+ .Times(1)
+ .RetiresOnSaturation();
+
+ EXPECT_CALL(*gl_,
+ CopyTexSubImage3D(kTarget, kLevel, kXoffset, kYoffset, kZoffset,
+ kX, kY, kWidth, kHeight))
+ .Times(1)
+ .RetiresOnSaturation();
+
+ CopyTexSubImage3D cmd;
+ cmd.Init(kTarget, kLevel, kXoffset, kYoffset, kZoffset,
+ kX, kY, kWidth, kHeight);
+ EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ EXPECT_EQ(GL_NO_ERROR, GetGLError());
+ EXPECT_TRUE(texture->SafeToRenderFrom());
+ EXPECT_TRUE(texture->IsLevelCleared(kTarget, kLevel));
+}
+
TEST_P(GLES3DecoderTest, CompressedTexImage3DFailsWithBadImageSize) {
const uint32_t kBucketId = 123;
const GLenum kTarget = GL_TEXTURE_2D_ARRAY;
« 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