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

Issue 1126243002: Check for shader version mismatch (Closed)

Created:
5 years, 7 months ago by oetuaho-nv
Modified:
5 years, 7 months 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

Check for shader version mismatch Shading language version is queried from ANGLE when a shader is translated and stored on the Shader object. When linking shader programs, it is checked whether the version numbers of the shaders match, and if they don't match, linking will fail. This is specified in OpenGL ES Shading Language 3.00 spec sections 1.5 and 3.3. Fixes WebGL 2 conformance test: https://www.khronos.org/registry/webgl/sdk/tests/conformance2/glsl3/shader-linking.html BUG=485060 TEST=WebGL conformance tests, gpu_unittests Committed: https://crrev.com/e6bdcf3bd8efc99152a68b37d313867f28a187c2 Cr-Commit-Position: refs/heads/master@{#328776}

Patch Set 1 #

Total comments: 4
Unified diffs Side-by-side diffs Delta from patch set Stats (+83 lines, -18 lines) Patch
M gpu/command_buffer/service/memory_program_cache_unittest.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M gpu/command_buffer/service/mocks.h View 1 chunk +2 lines, -1 line 0 comments Download
M gpu/command_buffer/service/program_manager.h View 1 chunk +3 lines, -0 lines 0 comments Download
M gpu/command_buffer/service/program_manager.cc View 2 chunks +20 lines, -0 lines 4 comments Download
M gpu/command_buffer/service/program_manager_unittest.cc View 5 chunks +10 lines, -8 lines 0 comments Download
M gpu/command_buffer/service/shader_manager.h View 3 chunks +10 lines, -0 lines 0 comments Download
M gpu/command_buffer/service/shader_manager.cc View 2 chunks +2 lines, -0 lines 0 comments Download
M gpu/command_buffer/service/shader_manager_unittest.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M gpu/command_buffer/service/shader_translator.h View 2 chunks +2 lines, -0 lines 0 comments Download
M gpu/command_buffer/service/shader_translator.cc View 2 chunks +3 lines, -0 lines 0 comments Download
M gpu/command_buffer/service/shader_translator_unittest.cc View 15 chunks +15 lines, -0 lines 0 comments Download
M gpu/command_buffer/service/test_helper.h View 1 chunk +1 line, -0 lines 0 comments Download
M gpu/command_buffer/service/test_helper.cc View 4 chunks +11 lines, -5 lines 0 comments Download

Messages

Total messages: 10 (2 generated)
oetuaho-nv
Please review! Further changes to support invariant qualifier in ESSL3 also depend on this.
5 years, 7 months ago (2015-05-06 14:26:13 UTC) #2
Zhenyao Mo
Mostly looks good. https://codereview.chromium.org/1126243002/diff/1/gpu/command_buffer/service/program_manager.cc File gpu/command_buffer/service/program_manager.cc (right): https://codereview.chromium.org/1126243002/diff/1/gpu/command_buffer/service/program_manager.cc#newcode1048 gpu/command_buffer/service/program_manager.cc:1048: return true; This is based on ...
5 years, 7 months ago (2015-05-06 17:57:42 UTC) #3
oetuaho-nv
https://codereview.chromium.org/1126243002/diff/1/gpu/command_buffer/service/program_manager.cc File gpu/command_buffer/service/program_manager.cc (right): https://codereview.chromium.org/1126243002/diff/1/gpu/command_buffer/service/program_manager.cc#newcode1048 gpu/command_buffer/service/program_manager.cc:1048: return true; On 2015/05/06 17:57:42, Zhenyao Mo wrote: > ...
5 years, 7 months ago (2015-05-07 08:02:41 UTC) #4
Jamie Madill
Looks good here though I'm not an owner. Couldn't hurt to add a unit test ...
5 years, 7 months ago (2015-05-07 11:27:54 UTC) #5
Zhenyao Mo
LGTM https://codereview.chromium.org/1126243002/diff/1/gpu/command_buffer/service/program_manager.cc File gpu/command_buffer/service/program_manager.cc (right): https://codereview.chromium.org/1126243002/diff/1/gpu/command_buffer/service/program_manager.cc#newcode1048 gpu/command_buffer/service/program_manager.cc:1048: return true; On 2015/05/07 08:02:41, oetuaho-nv wrote: > ...
5 years, 7 months ago (2015-05-07 14:33:08 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1126243002/1
5 years, 7 months ago (2015-05-07 15:30:11 UTC) #8
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years, 7 months ago (2015-05-07 16:45:37 UTC) #9
commit-bot: I haz the power
5 years, 7 months ago (2015-05-07 16:46:30 UTC) #10
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/e6bdcf3bd8efc99152a68b37d313867f28a187c2
Cr-Commit-Position: refs/heads/master@{#328776}

Powered by Google App Engine
This is Rietveld 408576698