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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc

Issue 481913005: gpu: glCopyTextureCHROMIUM() checks dest internal format incorrectly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« gpu/command_buffer/service/gles2_cmd_decoder.cc ('K') | « 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/tests/gl_copy_texture_CHROMIUM_unittest.cc
diff --git a/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc b/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc
index b6f82e7f23a7c4ce443e705a995a466557c62535..b1aab2285733fe6beed88f27e5156890bea8d5fd 100644
--- a/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc
+++ b/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc
@@ -73,7 +73,116 @@ TEST_F(GLCopyTextureCHROMIUMTest, Basic) {
glCheckFramebufferStatus(GL_FRAMEBUFFER));
GLTestHelper::CheckPixels(0, 0, 1, 1, 0, pixels);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
no sievers 2014/08/22 18:07:19 nit: EXPECT_EQ(GL_NO_ERROR, glGetError()) here and
dshwang 2014/08/22 19:07:55 Done.
dshwang 2014/08/22 19:11:42 ah... clang preprocessor converts macro to int whi
+}
+
+TEST_F(GLCopyTextureCHROMIUMTest, InternalFormat) {
+ GLint src_formats[] = {GL_ALPHA, GL_RGB, GL_RGBA,
+ GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_BGRA_EXT};
+ GLint dest_formats[] = {GL_RGB, GL_RGBA};
+
+ for (size_t src_index = 0; src_index < arraysize(src_formats); src_index++) {
+ for (size_t dest_index = 0; dest_index < arraysize(dest_formats);
+ dest_index++) {
+ glBindTexture(GL_TEXTURE_2D, textures_[0]);
+ glTexImage2D(GL_TEXTURE_2D,
+ 0,
+ src_formats[src_index],
+ 1,
+ 1,
+ 0,
+ src_formats[src_index],
+ GL_UNSIGNED_BYTE,
+ NULL);
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
+
+ glCopyTextureCHROMIUM(GL_TEXTURE_2D,
+ textures_[0],
+ textures_[1],
+ 0,
+ dest_formats[dest_index],
+ GL_UNSIGNED_BYTE);
+ EXPECT_EQ(glGetError(), GL_NO_ERROR) << "src_index:" << src_index
+ << " dest_index:" << dest_index;
+ }
+ }
+
no sievers 2014/08/22 18:07:19 nit: can you cut this off into a separate test her
dshwang 2014/08/22 19:07:55 Yes. I separated it.
+ glBindTexture(GL_TEXTURE_2D, textures_[0]);
+ glTexImage2D(
+ GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
+
+ // Check unsupported format reports error.
+ GLint unsupported_dest_formats[] = {GL_ALPHA, GL_LUMINANCE,
+ GL_LUMINANCE_ALPHA, GL_BGRA_EXT};
+ for (size_t dest_index = 0; dest_index < arraysize(unsupported_dest_formats);
+ dest_index++) {
+ glCopyTextureCHROMIUM(GL_TEXTURE_2D,
+ textures_[0],
+ textures_[1],
+ 0,
+ unsupported_dest_formats[dest_index],
+ GL_UNSIGNED_BYTE);
+ EXPECT_EQ(glGetError(), GL_INVALID_VALUE) << "dest_index:" << dest_index;
+ }
+}
+
+// Test to ensure that the destination texture is redefined if the properties
+// are different.
+TEST_F(GLCopyTextureCHROMIUMTest, RedefineDestinationTexture) {
+ uint8 pixels[4 * 4] = {255u, 0u, 0u, 255u, 255u, 0u, 0u, 255u,
+ 255u, 0u, 0u, 255u, 255u, 0u, 0u, 255u};
+
+ glBindTexture(GL_TEXTURE_2D, textures_[0]);
+ glTexImage2D(
+ GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+
+ glBindTexture(GL_TEXTURE_2D, textures_[1]);
+ glTexImage2D(GL_TEXTURE_2D,
+ 0,
+ GL_BGRA_EXT,
+ 1,
+ 1,
+ 0,
+ GL_BGRA_EXT,
+ GL_UNSIGNED_BYTE,
+ pixels);
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
+
+ // GL_INVALID_OPERATION due to "intrinsic format" != "internal format".
+ glTexSubImage2D(
+ GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+ EXPECT_EQ(glGetError(), GL_INVALID_OPERATION);
+ // GL_INVALID_VALUE due to bad dimensions.
+ glTexSubImage2D(
+ GL_TEXTURE_2D, 0, 1, 1, 1, 1, GL_BGRA_EXT, GL_UNSIGNED_BYTE, pixels);
+ EXPECT_EQ(glGetError(), GL_INVALID_VALUE);
no sievers 2014/08/22 18:07:19 hmm not sure these tests for TexSubImage2D() behav
dshwang 2014/08/22 19:07:55 Yes, I piggy back TexSubImage2D()'s error check, b
+
+ // If the dest texture has different properties, glCopyTextureCHROMIUM()
+ // redefines them.
+ glCopyTextureCHROMIUM(
+ GL_TEXTURE_2D, textures_[0], textures_[1], 0, GL_RGBA, GL_UNSIGNED_BYTE);
+ EXPECT_TRUE(glGetError() == GL_NO_ERROR);
+
+ // glTexSubImage2D() succeeds because textures_[1] is redefined into 2x2
+ // dimension and GL_RGBA format.
+ glBindTexture(GL_TEXTURE_2D, textures_[1]);
+ glTexSubImage2D(
+ GL_TEXTURE_2D, 0, 1, 1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
+
+ // Check the FB is still bound.
+ GLint value = 0;
+ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &value);
+ GLuint fb_id = value;
+ EXPECT_EQ(framebuffer_id_, fb_id);
+
+ // Check that FB is complete.
+ EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
+ glCheckFramebufferStatus(GL_FRAMEBUFFER));
+
+ GLTestHelper::CheckPixels(1, 1, 1, 1, 0, pixels);
no sievers 2014/08/22 18:07:19 Althought you define all pixels to the same value
dshwang 2014/08/22 19:07:55 That's right. Now I compare it with &pixel[12]
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
}
// Test that the extension respects the flip-y pixel storage setting.
@@ -95,7 +204,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, FlipY) {
glPixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, GL_TRUE);
glCopyTextureCHROMIUM(GL_TEXTURE_2D, textures_[0], textures_[1], 0, GL_RGBA,
GL_UNSIGNED_BYTE);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
uint8 copied_pixels[2][2][4] = {{{0}}};
glReadPixels(0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, copied_pixels);
@@ -108,7 +217,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, FlipY) {
}
}
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
}
// Test that the extension respects the GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM
@@ -123,7 +232,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, PremultiplyAlpha) {
glPixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM, GL_TRUE);
glCopyTextureCHROMIUM(GL_TEXTURE_2D, textures_[0], textures_[1], 0, GL_RGBA,
GL_UNSIGNED_BYTE);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
uint8 copied_pixels[1 * 4] = {0};
glReadPixels(0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, copied_pixels);
@@ -132,7 +241,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, PremultiplyAlpha) {
EXPECT_EQ(1u, copied_pixels[2]);
EXPECT_EQ(128u, copied_pixels[3]);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
}
// Test that the extension respects the GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM
@@ -147,7 +256,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, UnpremultiplyAlpha) {
glPixelStorei(GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, GL_TRUE);
glCopyTextureCHROMIUM(GL_TEXTURE_2D, textures_[0], textures_[1], 0, GL_RGBA,
GL_UNSIGNED_BYTE);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
uint8 copied_pixels[1 * 4] = {0};
glReadPixels(0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, copied_pixels);
@@ -156,7 +265,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, UnpremultiplyAlpha) {
EXPECT_EQ(32u, copied_pixels[2]);
EXPECT_EQ(128u, copied_pixels[3]);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
}
TEST_F(GLCopyTextureCHROMIUMTest, FlipYAndPremultiplyAlpha) {
@@ -179,7 +288,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, FlipYAndPremultiplyAlpha) {
glPixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM, GL_TRUE);
glCopyTextureCHROMIUM(GL_TEXTURE_2D, textures_[0], textures_[1], 0, GL_RGBA,
GL_UNSIGNED_BYTE);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
uint8 copied_pixels[2][2][4] = {{{0}}};
glReadPixels(0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, copied_pixels);
@@ -192,7 +301,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, FlipYAndPremultiplyAlpha) {
}
}
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
}
TEST_F(GLCopyTextureCHROMIUMTest, FlipYAndUnpremultiplyAlpha) {
@@ -215,7 +324,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, FlipYAndUnpremultiplyAlpha) {
glPixelStorei(GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, GL_TRUE);
glCopyTextureCHROMIUM(GL_TEXTURE_2D, textures_[0], textures_[1], 0, GL_RGBA,
GL_UNSIGNED_BYTE);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
uint8 copied_pixels[2][2][4] = {{{0}}};
glReadPixels(0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, copied_pixels);
@@ -228,7 +337,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, FlipYAndUnpremultiplyAlpha) {
}
}
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
}
namespace {
@@ -268,7 +377,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, BasicStatePreservation) {
glCopyTextureCHROMIUM(GL_TEXTURE_2D, textures_[0], textures_[1], 0,
GL_RGBA, GL_UNSIGNED_BYTE);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
EXPECT_EQ(setting, glIsEnabled(GL_DEPTH_TEST));
EXPECT_EQ(setting, glIsEnabled(GL_SCISSOR_TEST));
@@ -292,7 +401,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, BasicStatePreservation) {
EXPECT_EQ(GL_TEXTURE1 + x, active_texture);
}
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
};
// Verify that invocation of the extension does not modify the bound
@@ -315,7 +424,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, TextureStatePreserved) {
glCopyTextureCHROMIUM(GL_TEXTURE_2D, textures_[0], textures_[1], 0,
GL_RGBA, GL_UNSIGNED_BYTE);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
GLint active_texture = 0;
glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture);
@@ -334,7 +443,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, TextureStatePreserved) {
glDeleteTextures(2, texture_ids);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
}
// Verify that invocation of the extension does not perturb the currently
@@ -375,7 +484,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, FBOStatePreserved) {
glCopyTextureCHROMIUM(GL_TEXTURE_2D, textures_[0], textures_[1], 0,
GL_RGBA, GL_UNSIGNED_BYTE);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
EXPECT_TRUE(glIsFramebuffer(framebuffer_id));
@@ -419,7 +528,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, FBOStatePreserved) {
glDeleteTextures(1, &texture_id);
glDeleteFramebuffers(1, &framebuffer_id);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
}
TEST_F(GLCopyTextureCHROMIUMTest, ProgramStatePreservation) {
@@ -455,7 +564,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, ProgramStatePreservation) {
// Delete program from other context.
gl2.MakeCurrent();
glDeleteProgram(program);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
glFlush();
// Program should still be usable on this context.
@@ -485,7 +594,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, ProgramStatePreservation) {
glDrawArrays(GL_TRIANGLES, 0, 6);
EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected));
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
gl2.MakeCurrent();
gl2.Destroy();
@@ -501,7 +610,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, UninitializedSource) {
glCopyTextureCHROMIUM(GL_TEXTURE_2D, textures_[0], textures_[1], 0, GL_RGBA,
GL_UNSIGNED_BYTE);
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
uint8 pixels[kHeight][kWidth][4] = {{{1}}};
glReadPixels(0, 0, kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
@@ -514,7 +623,7 @@ TEST_F(GLCopyTextureCHROMIUMTest, UninitializedSource) {
}
}
- EXPECT_TRUE(GL_NO_ERROR == glGetError());
+ EXPECT_EQ(glGetError(), GL_NO_ERROR);
}
} // namespace gpu
« gpu/command_buffer/service/gles2_cmd_decoder.cc ('K') | « 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