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>
105 lines
3.2 KiB
Metal
105 lines
3.2 KiB
Metal
#include <metal_stdlib>
|
|
#include <simd/simd.h>
|
|
using namespace metal;
|
|
struct S {
|
|
float x;
|
|
int y;
|
|
};
|
|
struct Nested {
|
|
S a;
|
|
S b;
|
|
};
|
|
struct Compound {
|
|
float4 f4;
|
|
int3 i3;
|
|
};
|
|
struct Uniforms {
|
|
half4 colorRed;
|
|
half4 colorGreen;
|
|
};
|
|
struct Inputs {
|
|
};
|
|
struct Outputs {
|
|
half4 sk_FragColor [[color(0)]];
|
|
};
|
|
|
|
thread bool operator==(thread const S& left, thread const S& right);
|
|
thread bool operator!=(thread const S& left, thread const S& right);
|
|
|
|
thread bool operator==(thread const Nested& left, thread const Nested& right);
|
|
thread bool operator!=(thread const Nested& left, thread const Nested& right);
|
|
|
|
thread bool operator==(thread const Compound& left, thread const Compound& right);
|
|
thread bool operator!=(thread const Compound& left, thread const Compound& right);
|
|
void modifies_a_struct_vS(thread S& s);
|
|
void _skOutParamHelper0_modifies_a_struct_vS(thread S& s) {
|
|
S _var0 = s;
|
|
modifies_a_struct_vS(_var0);
|
|
s = _var0;
|
|
}
|
|
void modifies_a_struct_vS(thread S& s);
|
|
void _skOutParamHelper1_modifies_a_struct_vS(thread Nested& n3) {
|
|
S _var0 = n3.b;
|
|
modifies_a_struct_vS(_var0);
|
|
n3.b = _var0;
|
|
}
|
|
thread bool operator==(thread const S& left, thread const S& right) {
|
|
return all(left.x == right.x) &&
|
|
all(left.y == right.y);
|
|
}
|
|
thread bool operator!=(thread const S& left, thread const S& right) {
|
|
return !(left == right);
|
|
}
|
|
thread bool operator==(thread const Nested& left, thread const Nested& right) {
|
|
return all(left.a == right.a) &&
|
|
all(left.b == right.b);
|
|
}
|
|
thread bool operator!=(thread const Nested& left, thread const Nested& right) {
|
|
return !(left == right);
|
|
}
|
|
thread bool operator==(thread const Compound& left, thread const Compound& right) {
|
|
return all(left.f4 == right.f4) &&
|
|
all(left.i3 == right.i3);
|
|
}
|
|
thread bool operator!=(thread const Compound& left, thread const Compound& right) {
|
|
return !(left == right);
|
|
}
|
|
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(thread S& s) {
|
|
s.x++;
|
|
s.y++;
|
|
}
|
|
fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
|
|
Outputs _out;
|
|
(void)_out;
|
|
S s = returns_a_struct_S();
|
|
float x = accepts_a_struct_fS(s);
|
|
_skOutParamHelper0_modifies_a_struct_vS(s);
|
|
S expected = constructs_a_struct_S();
|
|
Nested n1;
|
|
Nested n2;
|
|
Nested n3;
|
|
n1.a = returns_a_struct_S();
|
|
n1.b = n1.a;
|
|
n2 = n1;
|
|
n3 = n2;
|
|
_skOutParamHelper1_modifies_a_struct_vS(n3);
|
|
Compound c1 = Compound{float4(1.0, 2.0, 3.0, 4.0), int3(5, 6, 7)};
|
|
Compound c2 = Compound{float4(float(_uniforms.colorGreen.y), 2.0, 3.0, 4.0), int3(5, 6, 7)};
|
|
Compound c3 = Compound{float4(float(_uniforms.colorGreen.x), 2.0, 3.0, 4.0), int3(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;
|
|
_out.sk_FragColor = valid ? _uniforms.colorGreen : _uniforms.colorRed;
|
|
return _out;
|
|
}
|