diff options
author | dongseong.hwang <dongseong.hwang@intel.com> | 2014-11-21 11:54:41 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-21 19:55:06 +0000 |
commit | df36f0aebe453bdbe842c85b331f6f07a24255a2 (patch) | |
tree | 3d6b3ea41bac35f900724fec1747c0e29c3daa23 /gpu/command_buffer/tests | |
parent | b2a77c768f3c6402eec83d2d0af1915fbf7f1d31 (diff) | |
download | chromium_src-df36f0aebe453bdbe842c85b331f6f07a24255a2.zip chromium_src-df36f0aebe453bdbe842c85b331f6f07a24255a2.tar.gz chromium_src-df36f0aebe453bdbe842c85b331f6f07a24255a2.tar.bz2 |
gpu: fix CopyTextureCHROMIUM for immutable texture.
We cannot use glCopyTexImage2D on the texture which is allocated by glTexStorage2D [1]
[1] https://www.opengl.org/registry/specs/ARB/texture_storage.txt
The fast path uses glCopyTexSubImage2D instead of glCopyTexImage2D.
In addition, optimize CopyTextureCHROMIUM for GL_TEXTURE_RECTANGLE_ARB,
which is often used by the compositor, so make CopyTextureCHROMIUM use
the fast path.
Review URL: https://codereview.chromium.org/744713002
Cr-Commit-Position: refs/heads/master@{#305268}
Diffstat (limited to 'gpu/command_buffer/tests')
-rw-r--r-- | gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc | 37 |
1 files changed, 37 insertions, 0 deletions
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 2c44e1a..a8cbb66 100644 --- a/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc +++ b/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc @@ -76,6 +76,43 @@ TEST_F(GLCopyTextureCHROMIUMTest, Basic) { EXPECT_TRUE(GL_NO_ERROR == glGetError()); } +TEST_F(GLCopyTextureCHROMIUMTest, ImmutableTexture) { + if (!GLTestHelper::HasExtension("GL_EXT_texture_storage")) { + LOG(INFO) << "GL_EXT_texture_storage not supported. Skipping test..."; + return; + } + + uint8 pixels[1 * 4] = {255u, 0u, 0u, 255u}; + + glBindTexture(GL_TEXTURE_2D, textures_[0]); + glTexStorage2DEXT(GL_TEXTURE_2D, 1, GL_RGBA8_OES, 1, 1); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, + pixels); + + glBindTexture(GL_TEXTURE_2D, textures_[1]); + glTexStorage2DEXT(GL_TEXTURE_2D, 1, GL_RGBA8_OES, 1, 1); + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, + textures_[1], 0); + EXPECT_TRUE(glGetError() == GL_NO_ERROR); + + glCopyTextureCHROMIUM(GL_TEXTURE_2D, textures_[0], textures_[1], 0, GL_RGBA, + GL_UNSIGNED_BYTE); + EXPECT_TRUE(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(0, 0, 1, 1, 0, pixels); + EXPECT_TRUE(GL_NO_ERROR == glGetError()); +} + TEST_F(GLCopyTextureCHROMIUMTest, InternalFormat) { GLint src_formats[] = {GL_ALPHA, GL_RGB, GL_RGBA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_BGRA_EXT}; |