skia2/tests/sksl/shared/StructsInFunctions.glsl

52 lines
1.2 KiB
Plaintext
Raw Normal View History

out vec4 sk_FragColor;
uniform vec4 colorRed;
uniform vec4 colorGreen;
struct S {
float x;
int y;
};
struct Nested {
S a;
S b;
};
Reland "Fix Metal codegen error with structs containing compound types." This reverts commit 3aaed99930f1c913255fe995df17c77a863e1ab3. Reason for revert: removing changes to PrecisionQualifiers Original change's description: > Revert "Fix Metal codegen error with structs containing compound types." > > This reverts commit 2a6c41571b5fbe7d0b124b39e06a308668d5e33c. > > Reason for revert: causing Mali G7x failures on tree > > Original change's description: > > Fix Metal codegen error with structs containing compound types. > > > > While working on an unrelated test, I accidentally triggered a bug in > > Metal code generation. Our struct-equality helper functions did not > > properly handle vector fields. Wrapping each comparison in `all(...)` > > fixes the problem. (all() on a scalar is allowed and does nothing.) > > > > Our struct comparison tests now include a vector and a matrix. > > > > Change-Id: I59061ae9c3c3ab2c2dbdcb5257bc23e2257152af > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/470399 > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com,skcq-be@skia-corp.google.com.iam.gserviceaccount.com > > Change-Id: Ieb5d5a1839978fb82525863488e9d54fdf44adbd > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/471097 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Reviewed-by: Chris Dalton <csmartdalton@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> Change-Id: I8ee90df3de075cf82c0fcf3b4787577b09bb1a70 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/471156 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-11-13 03:56:36 +00:00
struct Compound {
vec4 f4;
ivec3 i3;
};
S returns_a_struct_S() {
S s;
s.x = 1.0;
s.y = 2;
return s;
}
S constructs_a_struct_S() {
return S(2.0, 3);
}
float accepts_a_struct_fS(S s) {
return s.x + float(s.y);
}
void modifies_a_struct_vS(inout S s) {
s.x++;
s.y++;
}
vec4 main() {
S s = returns_a_struct_S();
float x = accepts_a_struct_fS(s);
modifies_a_struct_vS(s);
S expected = constructs_a_struct_S();
Nested n1;
Nested n2;
Nested n3;
Reland "Implement operator== and != for Metal structs and arrays." This is a reland of 830c69ca66d339067cdc06775f59443a06fc15a2 Original change's description: > Implement operator== and != for Metal structs and arrays. > > GLSL/SkSL assumes that == and != on struct/array types should work. > We need to emit equality and inequality operators whenever we find code > that compares a struct or array. > > Structs and arrays can be arbitrarily nested, and either type can > contain a matrix. All of these things need custom equality operators in > Metal. Therefore, we need to recursively generate comparison operators > when any of these types are encountered. > > For arrays we get lucky, and we can cover all possible array types and > sizes with a single templated operator== method. Structs and matrices > have no such luck, and are generated separately on a per-type basis. > > For each of these types, operator== is implemented as an equality check > on each field, and operator!= is implemented in terms of operator==. > Equality and inequality are always emitted together. (Previously, matrix > equality and inequality were emitted and implemented independently, but > this is no longer the case.) > > Change-Id: I69ee01c0a390d7db6bcb2253ed6336ab20cc4d1d > Bug: skia:11908, skia:11924 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402016 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11908, skia:11924, skia:11929 Change-Id: I6336b6125e9774c1ca73e3d497e3466f11f6f25f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402559 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-29 18:39:35 +00:00
n1.a = returns_a_struct_S();
n1.b = n1.a;
n2 = n1;
n3 = n2;
modifies_a_struct_vS(n3.b);
Reland "Fix Metal codegen error with structs containing compound types." This reverts commit 3aaed99930f1c913255fe995df17c77a863e1ab3. Reason for revert: removing changes to PrecisionQualifiers Original change's description: > Revert "Fix Metal codegen error with structs containing compound types." > > This reverts commit 2a6c41571b5fbe7d0b124b39e06a308668d5e33c. > > Reason for revert: causing Mali G7x failures on tree > > Original change's description: > > Fix Metal codegen error with structs containing compound types. > > > > While working on an unrelated test, I accidentally triggered a bug in > > Metal code generation. Our struct-equality helper functions did not > > properly handle vector fields. Wrapping each comparison in `all(...)` > > fixes the problem. (all() on a scalar is allowed and does nothing.) > > > > Our struct comparison tests now include a vector and a matrix. > > > > Change-Id: I59061ae9c3c3ab2c2dbdcb5257bc23e2257152af > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/470399 > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com,skcq-be@skia-corp.google.com.iam.gserviceaccount.com > > Change-Id: Ieb5d5a1839978fb82525863488e9d54fdf44adbd > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/471097 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Reviewed-by: Chris Dalton <csmartdalton@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> Change-Id: I8ee90df3de075cf82c0fcf3b4787577b09bb1a70 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/471156 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-11-13 03:56:36 +00:00
Compound c1 = Compound(vec4(1.0, 2.0, 3.0, 4.0), ivec3(5, 6, 7));
Compound c2 = Compound(vec4(colorGreen.y, 2.0, 3.0, 4.0), ivec3(5, 6, 7));
Compound c3 = Compound(vec4(colorGreen.x, 2.0, 3.0, 4.0), ivec3(5, 6, 7));
bool valid = (((((((((x == 3.0 && s.x == 2.0) && s.y == 3) && s == expected) && s == S(2.0, 3)) && s != returns_a_struct_S()) && n1 == n2) && n1 != n3) && n3 == Nested(S(1.0, 2), S(2.0, 3))) && c1 == c2) && c2 != c3;
return valid ? colorGreen : colorRed;
}