skia2/tests/sksl/shared/Structs.glsl


out vec4 sk_FragColor;
struct A {
    int x;
    int y;
};
A a1;
struct B {
    float x;
    float y[2];
    A z;
};
B b1;
void main() {
    a1.x = 0;
    b1.x = 0.0;
    sk_FragColor.x = float(a1.x) + b1.x;
}
Convert several SkSL->GLSL unit tests to golden outputs. The new test files are intended to be identical to the unit tests in every meaningful way. (Comments and formatting are not preserved exactly.) In cases where a unit-test method contained more than one test, multiple test files were created; in these cases, new names were invented to match the apparent intent of each invocation. Followup CLs will continue to migrate additional tests. Change-Id: I785c6761ba7ee2b25b5ddc0108321734be23b77c Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316678 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com> 2020-09-14 21:30:13 +00:00
Align default values of GrShaderCaps with StandaloneShaderCaps. `fBuiltinFMASupport` is now true on both, and `fUsesPrecisionModifiers` is now false. Other mismatching flags exist, but they are non-trivial to synchronize as they are tied to extension strings. This will help our skslc-based unit tests generate the same results as our C++ unit tests did, but should not affect real-world results as these defaults will all be overwritten in a non-testing scenario. In practice, the `fUsesPrecisionModifiers` change is responsible for all of the diffs below. The other flags did not change the results of any of the currently-ported tests. Change-Id: Ieb056d852b027fa87c56fd89f971a77a10a8a124 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317204 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> 2020-09-15 20:09:11 +00:00			`out vec4 sk_FragColor;`
Convert several SkSL->GLSL unit tests to golden outputs. The new test files are intended to be identical to the unit tests in every meaningful way. (Comments and formatting are not preserved exactly.) In cases where a unit-test method contained more than one test, multiple test files were created; in these cases, new names were invented to match the apparent intent of each invocation. Followup CLs will continue to migrate additional tests. Change-Id: I785c6761ba7ee2b25b5ddc0108321734be23b77c Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316678 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com> 2020-09-14 21:30:13 +00:00			`struct A {`
Align default values of GrShaderCaps with StandaloneShaderCaps. `fBuiltinFMASupport` is now true on both, and `fUsesPrecisionModifiers` is now false. Other mismatching flags exist, but they are non-trivial to synchronize as they are tied to extension strings. This will help our skslc-based unit tests generate the same results as our C++ unit tests did, but should not affect real-world results as these defaults will all be overwritten in a non-testing scenario. In practice, the `fUsesPrecisionModifiers` change is responsible for all of the diffs below. The other flags did not change the results of any of the currently-ported tests. Change-Id: Ieb056d852b027fa87c56fd89f971a77a10a8a124 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317204 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> 2020-09-15 20:09:11 +00:00			`int x;`
			`int y;`
Emit top-level StructDefinition for every struct Previously, structs that were defined as part of a variable declaration would end up declared similarly in the generated code. Now, global variable declarations that include a struct definition generate two separate program elements. Bug: skia:11228 Change-Id: Id7ddde6931fe07a250c2c9c46153879005535fb3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/361359 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> 2021-01-28 16:00:20 +00:00			`};`
			`A a1;`
Convert several SkSL->GLSL unit tests to golden outputs. The new test files are intended to be identical to the unit tests in every meaningful way. (Comments and formatting are not preserved exactly.) In cases where a unit-test method contained more than one test, multiple test files were created; in these cases, new names were invented to match the apparent intent of each invocation. Followup CLs will continue to migrate additional tests. Change-Id: I785c6761ba7ee2b25b5ddc0108321734be23b77c Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316678 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com> 2020-09-14 21:30:13 +00:00			`struct B {`
Align default values of GrShaderCaps with StandaloneShaderCaps. `fBuiltinFMASupport` is now true on both, and `fUsesPrecisionModifiers` is now false. Other mismatching flags exist, but they are non-trivial to synchronize as they are tied to extension strings. This will help our skslc-based unit tests generate the same results as our C++ unit tests did, but should not affect real-world results as these defaults will all be overwritten in a non-testing scenario. In practice, the `fUsesPrecisionModifiers` change is responsible for all of the diffs below. The other flags did not change the results of any of the currently-ported tests. Change-Id: Ieb056d852b027fa87c56fd89f971a77a10a8a124 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317204 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> 2020-09-15 20:09:11 +00:00			`float x;`
Support structs in runtime effects Uses the pipeline-stage callback mechanism. It mangles the type name (with a test to verify that this works), and then calls defineStruct with the entire SkSL struct definition string. Bug: skia:10939 Change-Id: If14cf1b11faaa80ad8d4086cdacf68532bac43fc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368809 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> 2021-02-10 15:19:27 +00:00			`float y[2];`
Roll SPIRV-Headers and SPIRV-Tools This adds new validation rules that we were breaking. Binding and DescriptorSet can't be applied to push constants, nor to struct members. Bug: skia:12670 Bug: chromium:1270328 Change-Id: I332f77717b08d9945c8e5b79c5bf649a8f5f2043 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/474056 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> 2021-11-19 15:55:50 +00:00			`A z;`
Add global struct definitions to SkSL. Previously, GLSL and Metal code generators would emit a struct wherever the type was first used in the code, regardless of where it was originally defined or what scope the type needs to live in. This CL adds a ProgramElement for struct definitions, so that structs will now appear at the top-level as they were originally defined. In the case of Metal, some special handling is also needed to handle the Globals struct properly. Not yet fully supported: - No special handling for structs declared inside functions yet - No support for structs in separate scopes with overlapping names The severity of the remaining issues depends mostly on whether we want to support structs inside functions in Runtime Effects. Change-Id: Ia95d4529506cb3fa6da63f5cb548199a93e1c0c5 Bug: skia:10922, skia:10923, skia:10925, skia:10926 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338600 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> 2020-11-25 21:24:55 +00:00			`};`
			`B b1;`
Convert several SkSL->GLSL unit tests to golden outputs. The new test files are intended to be identical to the unit tests in every meaningful way. (Comments and formatting are not preserved exactly.) In cases where a unit-test method contained more than one test, multiple test files were created; in these cases, new names were invented to match the apparent intent of each invocation. Followup CLs will continue to migrate additional tests. Change-Id: I785c6761ba7ee2b25b5ddc0108321734be23b77c Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316678 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com> 2020-09-14 21:30:13 +00:00			`void main() {`
			`a1.x = 0;`
			`b1.x = 0.0;`
			`sk_FragColor.x = float(a1.x) + b1.x;`
			`}`