e076c3803a
This reverts commitef9a1b66d0. Reason for revert: not broken after all Original change's description: > Revert "Fix array-of-vector comparisons in Metal." > > This reverts commit130338c9e1. > > Reason for revert: SkSL_ArrayComparison test causes Adreno 630/640 to crash in Vulkan > > Original change's description: > > Fix array-of-vector comparisons in Metal. > > > > Comparing `vec1 == vec2` returns a bvec in Metal, so the result must be > > wrapped in `all()` in order to boil it down to a single boolean result. > > Our array-comparison helper function did not do this. Fortunately, > > `all(scalar)` is a no-op, so we can just wrap the result unilaterally. > > > > Change-Id: I4f1f09a6832164ae2e6577d53b317f561332d581 > > Bug: skia:12324 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437736 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Commit-Queue: Brian Osman <brianosman@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: Ic76a5527a8339c8201f52df08d43041d7dcbeb61 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:12324 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438077 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> # Not skipping CQ checks because this is a reland. Bug: skia:12324 Change-Id: I3da699b8d1113800efb27e162d0c6315f0aeaa49 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438176 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
21 lines
704 B
GLSL
21 lines
704 B
GLSL
|
|
out vec4 sk_FragColor;
|
|
uniform vec4 colorGreen;
|
|
uniform vec4 colorRed;
|
|
struct S {
|
|
int x;
|
|
int y;
|
|
};
|
|
vec4 main() {
|
|
float f1[4] = float[4](1.0, 2.0, 3.0, 4.0);
|
|
float f2[4] = float[4](1.0, 2.0, 3.0, 4.0);
|
|
float f3[4] = float[4](1.0, 2.0, 3.0, -4.0);
|
|
ivec3 v1[2] = ivec3[2](ivec3(1, 2, 3), ivec3(4, 5, 6));
|
|
ivec3 v2[2] = ivec3[2](ivec3(1, 2, 3), ivec3(4, 5, 6));
|
|
ivec3 v3[2] = ivec3[2](ivec3(1, 2, 3), ivec3(4, 5, -6));
|
|
S s1[3] = S[3](S(1, 2), S(3, 4), S(5, 6));
|
|
S s2[3] = S[3](S(1, 2), S(0, 0), S(5, 6));
|
|
S s3[3] = S[3](S(1, 2), S(3, 4), S(5, 6));
|
|
return ((((f1 == f2 && f1 != f3) && v1 == v2) && v1 != v3) && s1 != s2) && s3 == s1 ? colorGreen : colorRed;
|
|
}
|