6460541ee4
This reverts commit3aaed99930. Reason for revert: removing changes to PrecisionQualifiers Original change's description: > Revert "Fix Metal codegen error with structs containing compound types." > > This reverts commit2a6c41571b. > > 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>
56 lines
1.2 KiB
Plaintext
56 lines
1.2 KiB
Plaintext
/*#pragma settings NoInline*/
|
|
|
|
uniform half4 colorRed, colorGreen;
|
|
|
|
struct S { float x; int y; };
|
|
|
|
struct Nested { S a, b; };
|
|
|
|
struct Compound { float4 f4; int3 i3; };
|
|
|
|
S returns_a_struct() {
|
|
S s;
|
|
s.x = 1;
|
|
s.y = 2;
|
|
return s;
|
|
}
|
|
|
|
S constructs_a_struct() {
|
|
return S(2, 3);
|
|
}
|
|
|
|
float accepts_a_struct(S s) {
|
|
return s.x + float(s.y);
|
|
}
|
|
|
|
void modifies_a_struct(inout S s) {
|
|
s.x++;
|
|
s.y++;
|
|
}
|
|
|
|
half4 main(float2 coords) {
|
|
S s = returns_a_struct();
|
|
float x = accepts_a_struct(s);
|
|
modifies_a_struct(s);
|
|
|
|
S expected = constructs_a_struct();
|
|
|
|
Nested n1, n2, n3;
|
|
n1.a = returns_a_struct();
|
|
n1.b = n1.a;
|
|
n2 = n1;
|
|
n3 = n2;
|
|
modifies_a_struct(n3.b);
|
|
|
|
Compound c1 = Compound(float4(1, 2, 3, 4), int3(5, 6, 7));
|
|
Compound c2 = Compound(float4(colorGreen.g, 2, 3, 4), int3(5, 6, 7));
|
|
Compound c3 = Compound(float4(colorGreen.r, 2, 3, 4), int3(5, 6, 7));
|
|
|
|
bool valid = (x == 3) && (s.x == 2) && (s.y == 3) &&
|
|
(s == expected) && (s == S(2, 3)) && (s != returns_a_struct()) &&
|
|
(n1 == n2) && (n1 != n3) && (n3 == Nested(S(1, 2), S(2, 3))) &&
|
|
(c1 == c2) && (c2 != c3);
|
|
|
|
return valid ? colorGreen : colorRed;
|
|
}
|