From 48b95d23777b0b02d25c37803bcace4cf044cf80 Mon Sep 17 00:00:00 2001 From: wychen Date: Thu, 29 Oct 2015 10:42:47 -0700 Subject: Revert of gpu: Make glTexSubImage2D work with GL_SRGB_ALPHA on OpenGL (patchset #2 id:20001 of https://codereview.chromium.org/1426903002/ ) Reason for revert: Caused Android test failure (GLEXTSRGBTest.TexImageSRGBALPHAFormat). Original issue's description: > gpu: Make glTexSubImage2D work with GL_SRGB_ALPHA on OpenGL > > Make glTexSubImage2D work when client passes GL_SRGB_ALPHA as the > format when running on OpenGL. > > Considering GL_SRGB_ALPHA texture: > In OpenGL ES, Tex*Image2D format must be GL_SRGB_ALPHA (same as texture > internal format). > In OpenGL, format must not be GL_SRGB_ALPHA. > > The format was handled correctly for glTexImage2D, but not for > glTexSubImage2D. The actual fix is to apply > TextureManager::AdjustTexFormat to glTexSubImage2D format. > > Moves the glTexSubImage2D code from decoder to texture manager, and > tries to follow the structure of glTexImage2D. This is due to hoping to > reduce the amount of similar inconsistency bugs. The glTexSubImage3D, > CopySubTexture* and compressed call variants are still potential > sources of inconsistencies. The code duplication between glTexImage2D > and glTexSubImage2D is not addressed, either. > > Changes the texture size of > Service/GLES2DecoderTest.TexSubImage2DBadArgs. The check for behavior > "!pixels -> kOutOfBounds" was moved before argument validation. In the > test, there is a subtest that uses invalid type, GL_UNSIGNED_INT. This > causes the texture data to be bigger than SHM buffer, the unexpected > kOutOfBounds would be returned instead of normal GL error for invalid > type. > > BUG=skia:2992 > > Committed: https://crrev.com/60da545176aed90d91874a456da2bac8b822c67d > Cr-Commit-Position: refs/heads/master@{#356787} TBR=bajones@chromium.org,piman@chromium.org,kkinnunen@nvidia.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:2992 Review URL: https://codereview.chromium.org/1418113009 Cr-Commit-Position: refs/heads/master@{#356882} --- gpu/gpu.gyp | 1 - 1 file changed, 1 deletion(-) (limited to 'gpu/gpu.gyp') diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index d543c56..7a11c3c 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -367,7 +367,6 @@ 'command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc', 'command_buffer/tests/gl_cube_map_texture_unittest.cc', 'command_buffer/tests/gl_depth_texture_unittest.cc', - 'command_buffer/tests/gl_ext_srgb_unittest.cc', 'command_buffer/tests/gl_fence_sync_unittest.cc', 'command_buffer/tests/gl_gpu_memory_buffer_unittest.cc', 'command_buffer/tests/gl_lose_context_chromium_unittest.cc', -- cgit v1.1