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

Issue 1418113009: Revert of gpu: Make glTexSubImage2D work with GL_SRGB_ALPHA on OpenGL (Closed)

Created:
5 years, 1 month ago by wychen
Modified:
5 years, 1 month ago
CC:
chromium-reviews, piman+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

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 Committed: https://crrev.com/48b95d23777b0b02d25c37803bcace4cf044cf80 Cr-Commit-Position: refs/heads/master@{#356882}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+183 lines, -295 lines) Patch
M gpu/BUILD.gn View 1 chunk +0 lines, -1 line 0 comments Download
M gpu/command_buffer/service/gles2_cmd_decoder.cc View 6 chunks +181 lines, -24 lines 0 comments Download
M gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M gpu/command_buffer/service/texture_manager.h View 2 chunks +0 lines, -37 lines 0 comments Download
M gpu/command_buffer/service/texture_manager.cc View 2 chunks +0 lines, -157 lines 0 comments Download
D gpu/command_buffer/tests/gl_ext_srgb_unittest.cc View 1 chunk +0 lines, -73 lines 0 comments Download
M gpu/gpu.gyp View 1 chunk +0 lines, -1 line 0 comments Download

Messages

Total messages: 11 (3 generated)
wychen
Created Revert of gpu: Make glTexSubImage2D work with GL_SRGB_ALPHA on OpenGL
5 years, 1 month ago (2015-10-29 17:35:53 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1418113009/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1418113009/1
5 years, 1 month ago (2015-10-29 17:37:55 UTC) #2
commit-bot: I haz the power
No L-G-T-M from a valid reviewer yet. Only full committers are accepted. Even if an ...
5 years, 1 month ago (2015-10-29 17:37:56 UTC) #4
mdjones
lgtm
5 years, 1 month ago (2015-10-29 17:38:45 UTC) #7
bajones
On 2015/10/29 17:38:45, mdjones wrote: > lgtm LGTM.
5 years, 1 month ago (2015-10-29 17:39:43 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1418113009/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1418113009/1
5 years, 1 month ago (2015-10-29 17:40:26 UTC) #9
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years, 1 month ago (2015-10-29 17:42:57 UTC) #10
commit-bot: I haz the power
5 years, 1 month ago (2015-10-29 17:44:33 UTC) #11
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/48b95d23777b0b02d25c37803bcace4cf044cf80
Cr-Commit-Position: refs/heads/master@{#356882}

Powered by Google App Engine
This is Rietveld 408576698