AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12b6796407
skia2/resources/sksl/errors/LayoutInFunctions.sksl

53 lines
1.6 KiB
Plaintext
Raw Normal View History

Add permittedLayoutFlags to checkModifiers For now, just use this to prevent *any* layout qualifiers from appearing on functions, or their parameters. Bug: skia:11301 Change-Id: I05d8118c7121048c6ef49695a54e3714a8f8687e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376796 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-26 16:52:59 +00:00
layout (
origin_upper_left,
push_constant,
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
color,
Add permittedLayoutFlags to checkModifiers For now, just use this to prevent *any* layout qualifiers from appearing on functions, or their parameters. Bug: skia:11301 Change-Id: I05d8118c7121048c6ef49695a54e3714a8f8687e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376796 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-26 16:52:59 +00:00
location = 1,
offset = 1,
binding = 1,
index = 1,
set = 1,
builtin = 1,
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
input_attachment_index = 1)
Add permittedLayoutFlags to checkModifiers For now, just use this to prevent *any* layout qualifiers from appearing on functions, or their parameters. Bug: skia:11301 Change-Id: I05d8118c7121048c6ef49695a54e3714a8f8687e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376796 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-26 16:52:59 +00:00
void on_return() {}
void on_param(
layout (
origin_upper_left,
push_constant,
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
color,
Add permittedLayoutFlags to checkModifiers For now, just use this to prevent *any* layout qualifiers from appearing on functions, or their parameters. Bug: skia:11301 Change-Id: I05d8118c7121048c6ef49695a54e3714a8f8687e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376796 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-26 16:52:59 +00:00
location = 1,
offset = 1,
binding = 1,
index = 1,
set = 1,
builtin = 1,
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
input_attachment_index = 1) float x) {}
Add expected errors to every test file. This was (crudely) automated with shell scripts: http://go/paste/5484300603490304 Change-Id: Ic9e1c93112772d303d1158eb26d995f27b439eba Bug: skia:12665 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505637 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2022-02-08 17:19:26 +00:00
/*%%*
layout qualifier 'origin_upper_left' is not permitted here
layout qualifier 'push_constant' is not permitted here
layout qualifier 'blend_support_all_equations' is not permitted here
layout qualifier 'color' is not permitted here
layout qualifier 'location' is not permitted here
layout qualifier 'offset' is not permitted here
layout qualifier 'binding' is not permitted here
layout qualifier 'index' is not permitted here
layout qualifier 'set' is not permitted here
layout qualifier 'builtin' is not permitted here
layout qualifier 'input_attachment_index' is not permitted here
layout qualifier 'origin_upper_left' is not permitted here
layout qualifier 'push_constant' is not permitted here
layout qualifier 'blend_support_all_equations' is not permitted here
layout qualifier 'color' is not permitted here
layout qualifier 'location' is not permitted here
layout qualifier 'offset' is not permitted here
layout qualifier 'binding' is not permitted here
layout qualifier 'index' is not permitted here
layout qualifier 'set' is not permitted here
layout qualifier 'builtin' is not permitted here
layout qualifier 'input_attachment_index' is not permitted here
*%%*/
Reference in New Issue Copy Permalink