AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
b2b1d6553e
skia2/tests/sksl/errors/LayoutRepeatedQualifiers.glsl

46 lines
1.4 KiB
Plaintext
Raw Normal View History

Add flags for all layout qualifiers, check for duplicates Now, even if a qualifier has a default value, we will know that it appeared in the text. We can use that to check for redundant qualifiers (as is being done here), and in the IR generator to prevent any use of certain qualifiers, depending on context. (eg, runtime effects, wrong shader stage, on a parameter declaration, etc.) Bug: skia:11301 Change-Id: I2cd6ad35c2b4c4d6f87ade97e80aea84dc16ee4b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/374616 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-23 17:54:22 +00:00
### Compilation failed:
Remove (unused) geometry shader support Bug: skia:8451 skia:10827 Change-Id: I5b38a1d72cd4558f8e2a92aaf9b12f05efce0923 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442683 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-27 15:21:12 +00:00
error: 14: layout qualifier 'origin_upper_left' appears more than once
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
origin_upper_left,
^^^^^^^^^^^^^^^^^
Remove (unused) geometry shader support Bug: skia:8451 skia:10827 Change-Id: I5b38a1d72cd4558f8e2a92aaf9b12f05efce0923 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442683 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-27 15:21:12 +00:00
error: 15: layout qualifier 'push_constant' appears more than once
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
push_constant,
^^^^^^^^^^^^^
Remove (unused) geometry shader support Bug: skia:8451 skia:10827 Change-Id: I5b38a1d72cd4558f8e2a92aaf9b12f05efce0923 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442683 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-27 15:21:12 +00:00
error: 16: layout qualifier 'blend_support_all_equations' appears more than once
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
blend_support_all_equations,
^^^^^^^^^^^^^^^^^^^^^^^^^^^
Rename SkSL 'srgb_unpremul' to just 'color' Added comments to explain the semantics (both what's expected when you set the uniform, and what you see in the shader). The old name was confusing, because it sounded like you got an sRGB color in the shader. This is terse, but I think it's the cleanest syntax - and for embedding clients, they can use C++ (etc.) API to require that color uniforms are assigned from color types. Bug: skia:10479 Change-Id: If00ea754060494aaa83001a5b357687953de8a5f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/480577 Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-12-06 15:30:51 +00:00
error: 17: layout qualifier 'color' appears more than once
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
color,
^^^^^
Remove (unused) geometry shader support Bug: skia:8451 skia:10827 Change-Id: I5b38a1d72cd4558f8e2a92aaf9b12f05efce0923 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442683 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-27 15:21:12 +00:00
error: 18: layout qualifier 'location' appears more than once
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
location = 2,
^^^^^^^^
Remove (unused) geometry shader support Bug: skia:8451 skia:10827 Change-Id: I5b38a1d72cd4558f8e2a92aaf9b12f05efce0923 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442683 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-27 15:21:12 +00:00
error: 19: layout qualifier 'offset' appears more than once
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
offset = 2,
^^^^^^
Remove (unused) geometry shader support Bug: skia:8451 skia:10827 Change-Id: I5b38a1d72cd4558f8e2a92aaf9b12f05efce0923 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442683 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-27 15:21:12 +00:00
error: 20: layout qualifier 'binding' appears more than once
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
binding = 2,
^^^^^^^
Remove (unused) geometry shader support Bug: skia:8451 skia:10827 Change-Id: I5b38a1d72cd4558f8e2a92aaf9b12f05efce0923 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442683 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-27 15:21:12 +00:00
error: 21: layout qualifier 'index' appears more than once
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
index = 2,
^^^^^
Remove (unused) geometry shader support Bug: skia:8451 skia:10827 Change-Id: I5b38a1d72cd4558f8e2a92aaf9b12f05efce0923 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442683 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-27 15:21:12 +00:00
error: 22: layout qualifier 'set' appears more than once
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
set = 2,
^^^
Remove (unused) geometry shader support Bug: skia:8451 skia:10827 Change-Id: I5b38a1d72cd4558f8e2a92aaf9b12f05efce0923 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442683 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-27 15:21:12 +00:00
error: 23: layout qualifier 'builtin' appears more than once
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
builtin = 2,
^^^^^^^
Remove (unused) geometry shader support Bug: skia:8451 skia:10827 Change-Id: I5b38a1d72cd4558f8e2a92aaf9b12f05efce0923 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442683 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-27 15:21:12 +00:00
error: 24: layout qualifier 'input_attachment_index' appears more than once
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
input_attachment_index = 2
^^^^^^^^^^^^^^^^^^^^^^
Improved position reporting for various SkSL constructs This cleans up a lot of positions produced by DSLParser to make them actually match the ranges of the elements being parsed. Change-Id: Ic3a9d62c99c4b5f92b84a597a2ceba386bbcc334 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/527501 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-05 19:43:36 +00:00
error: 1: 'layout(color)' is only permitted in runtime effects
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
layout (
^^^^^^^^...
Improved position reporting for various SkSL constructs This cleans up a lot of positions produced by DSLParser to make them actually match the ranges of the elements being parsed. Change-Id: Ic3a9d62c99c4b5f92b84a597a2ceba386bbcc334 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/527501 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-05 19:43:36 +00:00
error: 1: 'layout(color)' is only permitted on 'uniform' variables
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
layout (
^^^^^^^^...
Improved position reporting for various SkSL constructs This cleans up a lot of positions produced by DSLParser to make them actually match the ranges of the elements being parsed. Change-Id: Ic3a9d62c99c4b5f92b84a597a2ceba386bbcc334 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/527501 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-05 19:43:36 +00:00
error: 1: 'layout(color)' is not permitted on variables of type 'float'
Added range highlighting to SkSL error reports SkSL errors now identify the specific range of code they are describing, rather than just the line number. Change-Id: Ifabb3148476f9b4cd8e532f23e5b38e1cf33a87e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528039 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-06 22:24:52 +00:00
layout (
^^^^^^^^...
Reenable DSLParser Change-Id: I1819b2c40902611d7e86245bff73ad8c2bd7629c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449060 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-09-16 14:42:24 +00:00
14 errors
Reference in New Issue Copy Permalink