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

Issue 2142353002: Validate fbo color image format and fragment shader output variable type. (Closed)

Created:
4 years, 5 months ago by Zhenyao Mo
Modified:
4 years, 5 months ago
CC:
chromium-reviews, Ken Russell (switch to Gerrit), 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

Validate fbo color image format and fragment shader output variable type. Also, set a draw buffer to NONE if there is no shader output variable corresponding to it. This also fixes the issue where we fail to initialize uninitialized images before calling ClearBuffer*. BUG=429053, 584059 TEST=draw-buffers.html,gpu_unittests R=piman@chromium.org CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel Committed: https://crrev.com/eaae3bb1ac1ba1dc5f54180c9e8dc180326a65e2 Cr-Commit-Position: refs/heads/master@{#405816}

Patch Set 1 #

Total comments: 1

Patch Set 2 : Validate fbo color image format and fragment shader output variable type. #

Patch Set 3 : Validate fbo color image format and fragment shader output variable type. #

Total comments: 4

Patch Set 4 : fix gl_tests failure #

Patch Set 5 : revision addressed piman review comments #

Total comments: 9

Patch Set 6 : Validate fbo color image format and fragment shader output variable type. #

Patch Set 7 : Fix #

Unified diffs Side-by-side diffs Delta from patch set Stats (+665 lines, -123 lines) Patch
M gpu/command_buffer/service/context_group.cc View 1 chunk +5 lines, -2 lines 0 comments Download
M gpu/command_buffer/service/context_state.h View 1 2 3 4 chunks +4 lines, -9 lines 0 comments Download
M gpu/command_buffer/service/context_state.cc View 1 2 3 8 chunks +33 lines, -18 lines 0 comments Download
M gpu/command_buffer/service/context_state_unittest.cc View 4 chunks +4 lines, -4 lines 0 comments Download
M gpu/command_buffer/service/framebuffer_manager.h View 1 2 3 4 5 6 6 chunks +48 lines, -4 lines 0 comments Download
M gpu/command_buffer/service/framebuffer_manager.cc View 1 2 3 4 5 6 7 chunks +96 lines, -26 lines 0 comments Download
M gpu/command_buffer/service/framebuffer_manager_unittest.cc View 1 2 3 4 5 6 6 chunks +146 lines, -7 lines 0 comments Download
M gpu/command_buffer/service/gles2_cmd_decoder.cc View 1 2 3 4 5 32 chunks +81 lines, -50 lines 0 comments Download
M gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc View 1 2 4 chunks +28 lines, -0 lines 0 comments Download
M gpu/command_buffer/service/program_manager.h View 1 2 3 4 7 chunks +23 lines, -2 lines 0 comments Download
M gpu/command_buffer/service/program_manager.cc View 1 2 3 4 5 6 chunks +70 lines, -1 line 0 comments Download
M gpu/command_buffer/service/program_manager_unittest.cc View 1 2 3 4 3 chunks +120 lines, -0 lines 0 comments Download
M gpu/command_buffer/service/shader_manager.h View 1 2 3 4 1 chunk +7 lines, -0 lines 0 comments Download

Dependent Patchsets:

Messages

Total messages: 60 (34 generated)
Zhenyao Mo
piman: This is not a complete CL (missing unit tests). Could you take a look ...
4 years, 5 months ago (2016-07-12 23:48:08 UTC) #2
Zhenyao Mo
kbr, cwallez: FYI
4 years, 5 months ago (2016-07-12 23:48:45 UTC) #3
Corentin Wallez
https://codereview.chromium.org/2142353002/diff/1/gpu/command_buffer/service/gles2_cmd_decoder.cc File gpu/command_buffer/service/gles2_cmd_decoder.cc (right): https://codereview.chromium.org/2142353002/diff/1/gpu/command_buffer/service/gles2_cmd_decoder.cc#newcode8070 gpu/command_buffer/service/gles2_cmd_decoder.cc:8070: adjusted_draw_buffers[ii] = GL_NONE; This looks like it will be ...
4 years, 5 months ago (2016-07-13 14:50:07 UTC) #9
Zhenyao Mo
On 2016/07/13 14:50:07, Corentin Wallez wrote: > https://codereview.chromium.org/2142353002/diff/1/gpu/command_buffer/service/gles2_cmd_decoder.cc > File gpu/command_buffer/service/gles2_cmd_decoder.cc (right): > > https://codereview.chromium.org/2142353002/diff/1/gpu/command_buffer/service/gles2_cmd_decoder.cc#newcode8070 ...
4 years, 5 months ago (2016-07-13 15:40:43 UTC) #12
Zhenyao Mo
On 2016/07/13 15:40:43, Zhenyao Mo wrote: > On 2016/07/13 14:50:07, Corentin Wallez wrote: > > ...
4 years, 5 months ago (2016-07-13 15:52:10 UTC) #13
Corentin Wallez
On 2016/07/13 at 15:52:10, zmo wrote: > On 2016/07/13 15:40:43, Zhenyao Mo wrote: > > ...
4 years, 5 months ago (2016-07-13 16:57:26 UTC) #14
Corentin Wallez
On 2016/07/13 at 16:57:26, Corentin Wallez wrote: > On 2016/07/13 at 15:52:10, zmo wrote: > ...
4 years, 5 months ago (2016-07-13 18:09:06 UTC) #17
Ken Russell (switch to Gerrit)
This is awesome! I'm not an OWNER but it LGTM overall. Good that we won't ...
4 years, 5 months ago (2016-07-13 21:37:28 UTC) #21
Zhenyao Mo
piman: Please review.
4 years, 5 months ago (2016-07-13 22:23:32 UTC) #23
piman
https://codereview.chromium.org/2142353002/diff/40001/gpu/command_buffer/service/framebuffer_manager.cc File gpu/command_buffer/service/framebuffer_manager.cc (right): https://codereview.chromium.org/2142353002/diff/40001/gpu/command_buffer/service/framebuffer_manager.cc#newcode525 gpu/command_buffer/service/framebuffer_manager.cc:525: for (size_t ii = 0; ii < manager_->max_draw_buffers_; ++ii) ...
4 years, 5 months ago (2016-07-13 22:35:55 UTC) #26
piman
https://codereview.chromium.org/2142353002/diff/40001/gpu/command_buffer/service/framebuffer_manager.cc File gpu/command_buffer/service/framebuffer_manager.cc (right): https://codereview.chromium.org/2142353002/diff/40001/gpu/command_buffer/service/framebuffer_manager.cc#newcode900 gpu/command_buffer/service/framebuffer_manager.cc:900: size_t index = it->first - GL_COLOR_ATTACHMENT0; On 2016/07/13 22:35:55, ...
4 years, 5 months ago (2016-07-13 23:16:36 UTC) #27
commit-bot: I haz the power
Your CL relies on deprecated CQ feature(s): * Specifying master names in CQ_INCLUDE_TRYBOTS part of ...
4 years, 5 months ago (2016-07-14 22:06:51 UTC) #32
Zhenyao Mo
piman: Please review again. I addressed your comments and also add comprehensive unit tests for ...
4 years, 5 months ago (2016-07-14 22:10:17 UTC) #33
piman
Thanks for the tests! A few comments, one functional typo, and some nits. https://codereview.chromium.org/2142353002/diff/80001/gpu/command_buffer/service/framebuffer_manager.cc File ...
4 years, 5 months ago (2016-07-14 23:41:14 UTC) #36
Zhenyao Mo
Revised. Please take another look. https://codereview.chromium.org/2142353002/diff/80001/gpu/command_buffer/service/framebuffer_manager.cc File gpu/command_buffer/service/framebuffer_manager.cc (right): https://codereview.chromium.org/2142353002/diff/80001/gpu/command_buffer/service/framebuffer_manager.cc#newcode525 gpu/command_buffer/service/framebuffer_manager.cc:525: uint32_t mask = 0x33 ...
4 years, 5 months ago (2016-07-15 02:41:15 UTC) #37
Zhenyao Mo
https://codereview.chromium.org/2142353002/diff/80001/gpu/command_buffer/service/gles2_cmd_decoder.cc File gpu/command_buffer/service/gles2_cmd_decoder.cc (right): https://codereview.chromium.org/2142353002/diff/80001/gpu/command_buffer/service/gles2_cmd_decoder.cc#newcode6845 gpu/command_buffer/service/gles2_cmd_decoder.cc:6845: } Have to take this out because it caused ...
4 years, 5 months ago (2016-07-15 02:42:50 UTC) #38
commit-bot: I haz the power
Your CL relies on deprecated CQ feature(s): * Specifying master names in CQ_INCLUDE_TRYBOTS part of ...
4 years, 5 months ago (2016-07-15 02:43:25 UTC) #41
piman
lgtm
4 years, 5 months ago (2016-07-15 03:12:10 UTC) #42
commit-bot: I haz the power
Your CL relies on deprecated CQ feature(s): * Specifying master names in CQ_INCLUDE_TRYBOTS part of ...
4 years, 5 months ago (2016-07-15 06:56:48 UTC) #47
Zhenyao Mo
On 2016/07/15 03:12:10, piman wrote: > lgtm piman: Please take another look. I had some ...
4 years, 5 months ago (2016-07-15 07:02:05 UTC) #48
piman
lgtm
4 years, 5 months ago (2016-07-15 18:57:25 UTC) #51
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2142353002/120001
4 years, 5 months ago (2016-07-15 19:17:49 UTC) #54
commit-bot: I haz the power
Your CL relies on deprecated CQ feature(s): * Specifying master names in CQ_INCLUDE_TRYBOTS part of ...
4 years, 5 months ago (2016-07-15 19:17:52 UTC) #55
commit-bot: I haz the power
Committed patchset #7 (id:120001)
4 years, 5 months ago (2016-07-15 19:23:37 UTC) #57
commit-bot: I haz the power
CQ bit was unchecked.
4 years, 5 months ago (2016-07-15 19:23:46 UTC) #58
commit-bot: I haz the power
4 years, 5 months ago (2016-07-15 19:26:54 UTC) #60
Message was sent while issue was closed.
Patchset 7 (id:??) landed as
https://crrev.com/eaae3bb1ac1ba1dc5f54180c9e8dc180326a65e2
Cr-Commit-Position: refs/heads/master@{#405816}

Powered by Google App Engine
This is Rietveld 408576698