skia2/tests/sksl/shared/ArrayComparison.metal

75 lines
3.0 KiB
Metal
Raw Normal View History

#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct S {
int x;
int y;
};
struct Uniforms {
Reland "Add support for half-precision types in Metal." This reverts commit 9d24b02c2fdb5eede1054b16b9c03b5ed26dc618. Reason for revert: needs premul/unpremul conversion fix (http://review.skia.org/465798) Original change's description: > Revert "Add support for half-precision types in Metal." > > This reverts commit d90e09b1ae0939b463f59f81c2958b8c08f5027b. > > Reason for revert: MacMini failing CompressedBackendAllocationTest > > Original change's description: > > Add support for half-precision types in Metal. > > > > This will hopefully improve performance on lower-end GPUs. > > > > Change-Id: I9c2ee6dc31acd08bec0bfb5f59edc3cf90163f9e > > Bug: skia:12339 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465078 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Bug: skia:12339 > Change-Id: Ic5aa4bef454ca67f5ce26c600444d9565e0158cb > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465796 > Auto-Submit: Brian Osman <brianosman@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12339 Change-Id: I53a8a6fef299da15d206d884ba7029820ffcff43 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465799 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-10-30 02:34:51 +00:00
half4 colorGreen;
half4 colorRed;
};
struct Inputs {
};
struct Outputs {
Reland "Add support for half-precision types in Metal." This reverts commit 9d24b02c2fdb5eede1054b16b9c03b5ed26dc618. Reason for revert: needs premul/unpremul conversion fix (http://review.skia.org/465798) Original change's description: > Revert "Add support for half-precision types in Metal." > > This reverts commit d90e09b1ae0939b463f59f81c2958b8c08f5027b. > > Reason for revert: MacMini failing CompressedBackendAllocationTest > > Original change's description: > > Add support for half-precision types in Metal. > > > > This will hopefully improve performance on lower-end GPUs. > > > > Change-Id: I9c2ee6dc31acd08bec0bfb5f59edc3cf90163f9e > > Bug: skia:12339 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465078 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Bug: skia:12339 > Change-Id: Ic5aa4bef454ca67f5ce26c600444d9565e0158cb > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465796 > Auto-Submit: Brian Osman <brianosman@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12339 Change-Id: I53a8a6fef299da15d206d884ba7029820ffcff43 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465799 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-10-30 02:34:51 +00:00
half4 sk_FragColor [[color(0)]];
};
Reland "Fix array-of-matrix/struct comparisons in Metal." This is a reland of 23d8f94535813d7c973af69aaeb67a0e5d7c9140 Original change's description: > Fix array-of-matrix/struct comparisons in Metal. > > Metal needs helper functions in order to compare arrays, structs, and > matrices. Depending on the input code, it was possible for the > array-comparison helper to be emitted before a matrix-comparison > or struct-comparison helper. If this occurred, array comparisons of that > matrix or struct type would fail, because the operator== for the array's > inner type was defined after array==, and Metal (like C++) parses > top-to-bottom and only considers functions declared above the current > function. > > We now emit prototypes for all the array, struct and matrix helper > function. These prototypes are emitted above any helper functions. This > ensures visibility no matter how your comparisons are organized. > > Change-Id: Ib3d8828c301fd0fa6c209788f9ea60800371edbe > Bug: skia:12326 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437739 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:12326 Change-Id: Ife68020f6b01fae973b97f76099c6d5e8215636c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438296 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-08-10 20:03:23 +00:00
template <typename T1, typename T2, size_t N>
bool operator==(thread const array<T1, N>& left, thread const array<T2, N>& right);
template <typename T1, typename T2, size_t N>
bool operator!=(thread const array<T1, N>& left, thread const array<T2, N>& right);
Reland "Add support for half-precision types in Metal." This reverts commit 9d24b02c2fdb5eede1054b16b9c03b5ed26dc618. Reason for revert: needs premul/unpremul conversion fix (http://review.skia.org/465798) Original change's description: > Revert "Add support for half-precision types in Metal." > > This reverts commit d90e09b1ae0939b463f59f81c2958b8c08f5027b. > > Reason for revert: MacMini failing CompressedBackendAllocationTest > > Original change's description: > > Add support for half-precision types in Metal. > > > > This will hopefully improve performance on lower-end GPUs. > > > > Change-Id: I9c2ee6dc31acd08bec0bfb5f59edc3cf90163f9e > > Bug: skia:12339 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465078 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Bug: skia:12339 > Change-Id: Ic5aa4bef454ca67f5ce26c600444d9565e0158cb > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465796 > Auto-Submit: Brian Osman <brianosman@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12339 Change-Id: I53a8a6fef299da15d206d884ba7029820ffcff43 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465799 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-10-30 02:34:51 +00:00
thread bool operator==(const half2x2 left, const half2x2 right);
thread bool operator!=(const half2x2 left, const half2x2 right);
Reland "Fix array-of-matrix/struct comparisons in Metal." This is a reland of 23d8f94535813d7c973af69aaeb67a0e5d7c9140 Original change's description: > Fix array-of-matrix/struct comparisons in Metal. > > Metal needs helper functions in order to compare arrays, structs, and > matrices. Depending on the input code, it was possible for the > array-comparison helper to be emitted before a matrix-comparison > or struct-comparison helper. If this occurred, array comparisons of that > matrix or struct type would fail, because the operator== for the array's > inner type was defined after array==, and Metal (like C++) parses > top-to-bottom and only considers functions declared above the current > function. > > We now emit prototypes for all the array, struct and matrix helper > function. These prototypes are emitted above any helper functions. This > ensures visibility no matter how your comparisons are organized. > > Change-Id: Ib3d8828c301fd0fa6c209788f9ea60800371edbe > Bug: skia:12326 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437739 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:12326 Change-Id: Ife68020f6b01fae973b97f76099c6d5e8215636c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438296 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-08-10 20:03:23 +00:00
thread bool operator==(thread const S& left, thread const S& right);
thread bool operator!=(thread const S& left, thread const S& right);
template <typename T1, typename T2, size_t N>
bool operator==(thread const array<T1, N>& left, thread const array<T2, N>& right) {
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
for (size_t index = 0; index < N; ++index) {
Reland "Fix array-of-vector comparisons in Metal." This reverts commit ef9a1b66d060dfbbd58859b3401e278611b55308. Reason for revert: not broken after all Original change's description: > Revert "Fix array-of-vector comparisons in Metal." > > This reverts commit 130338c9e1bc90afc63424115a6a8a842d43ddd5. > > 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>
2021-08-10 16:56:23 +00:00
if (!all(left[index] == right[index])) {
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
return false;
}
}
return true;
}
template <typename T1, typename T2, size_t N>
bool operator!=(thread const array<T1, N>& left, thread const array<T2, N>& right) {
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
return !(left == right);
}
Reland "Add support for half-precision types in Metal." This reverts commit 9d24b02c2fdb5eede1054b16b9c03b5ed26dc618. Reason for revert: needs premul/unpremul conversion fix (http://review.skia.org/465798) Original change's description: > Revert "Add support for half-precision types in Metal." > > This reverts commit d90e09b1ae0939b463f59f81c2958b8c08f5027b. > > Reason for revert: MacMini failing CompressedBackendAllocationTest > > Original change's description: > > Add support for half-precision types in Metal. > > > > This will hopefully improve performance on lower-end GPUs. > > > > Change-Id: I9c2ee6dc31acd08bec0bfb5f59edc3cf90163f9e > > Bug: skia:12339 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465078 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Bug: skia:12339 > Change-Id: Ic5aa4bef454ca67f5ce26c600444d9565e0158cb > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465796 > Auto-Submit: Brian Osman <brianosman@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12339 Change-Id: I53a8a6fef299da15d206d884ba7029820ffcff43 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465799 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-10-30 02:34:51 +00:00
thread bool operator==(const half2x2 left, const half2x2 right) {
Reland "Fix array-of-matrix/struct comparisons in Metal." This is a reland of 23d8f94535813d7c973af69aaeb67a0e5d7c9140 Original change's description: > Fix array-of-matrix/struct comparisons in Metal. > > Metal needs helper functions in order to compare arrays, structs, and > matrices. Depending on the input code, it was possible for the > array-comparison helper to be emitted before a matrix-comparison > or struct-comparison helper. If this occurred, array comparisons of that > matrix or struct type would fail, because the operator== for the array's > inner type was defined after array==, and Metal (like C++) parses > top-to-bottom and only considers functions declared above the current > function. > > We now emit prototypes for all the array, struct and matrix helper > function. These prototypes are emitted above any helper functions. This > ensures visibility no matter how your comparisons are organized. > > Change-Id: Ib3d8828c301fd0fa6c209788f9ea60800371edbe > Bug: skia:12326 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437739 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:12326 Change-Id: Ife68020f6b01fae973b97f76099c6d5e8215636c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438296 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-08-10 20:03:23 +00:00
return all(left[0] == right[0]) &&
all(left[1] == right[1]);
}
Reland "Add support for half-precision types in Metal." This reverts commit 9d24b02c2fdb5eede1054b16b9c03b5ed26dc618. Reason for revert: needs premul/unpremul conversion fix (http://review.skia.org/465798) Original change's description: > Revert "Add support for half-precision types in Metal." > > This reverts commit d90e09b1ae0939b463f59f81c2958b8c08f5027b. > > Reason for revert: MacMini failing CompressedBackendAllocationTest > > Original change's description: > > Add support for half-precision types in Metal. > > > > This will hopefully improve performance on lower-end GPUs. > > > > Change-Id: I9c2ee6dc31acd08bec0bfb5f59edc3cf90163f9e > > Bug: skia:12339 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465078 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Bug: skia:12339 > Change-Id: Ic5aa4bef454ca67f5ce26c600444d9565e0158cb > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465796 > Auto-Submit: Brian Osman <brianosman@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12339 Change-Id: I53a8a6fef299da15d206d884ba7029820ffcff43 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465799 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-10-30 02:34:51 +00:00
thread bool operator!=(const half2x2 left, const half2x2 right) {
Reland "Fix array-of-matrix/struct comparisons in Metal." This is a reland of 23d8f94535813d7c973af69aaeb67a0e5d7c9140 Original change's description: > Fix array-of-matrix/struct comparisons in Metal. > > Metal needs helper functions in order to compare arrays, structs, and > matrices. Depending on the input code, it was possible for the > array-comparison helper to be emitted before a matrix-comparison > or struct-comparison helper. If this occurred, array comparisons of that > matrix or struct type would fail, because the operator== for the array's > inner type was defined after array==, and Metal (like C++) parses > top-to-bottom and only considers functions declared above the current > function. > > We now emit prototypes for all the array, struct and matrix helper > function. These prototypes are emitted above any helper functions. This > ensures visibility no matter how your comparisons are organized. > > Change-Id: Ib3d8828c301fd0fa6c209788f9ea60800371edbe > Bug: skia:12326 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437739 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:12326 Change-Id: Ife68020f6b01fae973b97f76099c6d5e8215636c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438296 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-08-10 20:03:23 +00:00
return !(left == right);
}
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
thread bool operator==(thread const S& left, thread const S& right) {
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
return all(left.x == right.x) &&
all(left.y == right.y);
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
}
thread bool operator!=(thread const S& left, thread const S& right) {
return !(left == right);
}
fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
Outputs _out;
(void)_out;
array<float, 4> f1 = array<float, 4>{1.0, 2.0, 3.0, 4.0};
array<float, 4> f2 = array<float, 4>{1.0, 2.0, 3.0, 4.0};
array<float, 4> f3 = array<float, 4>{1.0, 2.0, 3.0, -4.0};
Reland "Fix array-of-vector comparisons in Metal." This reverts commit ef9a1b66d060dfbbd58859b3401e278611b55308. Reason for revert: not broken after all Original change's description: > Revert "Fix array-of-vector comparisons in Metal." > > This reverts commit 130338c9e1bc90afc63424115a6a8a842d43ddd5. > > 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>
2021-08-10 16:56:23 +00:00
array<int3, 2> v1 = array<int3, 2>{int3(1, 2, 3), int3(4, 5, 6)};
array<int3, 2> v2 = array<int3, 2>{int3(1, 2, 3), int3(4, 5, 6)};
array<int3, 2> v3 = array<int3, 2>{int3(1, 2, 3), int3(4, 5, -6)};
Reland "Add support for half-precision types in Metal." This reverts commit 9d24b02c2fdb5eede1054b16b9c03b5ed26dc618. Reason for revert: needs premul/unpremul conversion fix (http://review.skia.org/465798) Original change's description: > Revert "Add support for half-precision types in Metal." > > This reverts commit d90e09b1ae0939b463f59f81c2958b8c08f5027b. > > Reason for revert: MacMini failing CompressedBackendAllocationTest > > Original change's description: > > Add support for half-precision types in Metal. > > > > This will hopefully improve performance on lower-end GPUs. > > > > Change-Id: I9c2ee6dc31acd08bec0bfb5f59edc3cf90163f9e > > Bug: skia:12339 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465078 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Bug: skia:12339 > Change-Id: Ic5aa4bef454ca67f5ce26c600444d9565e0158cb > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465796 > Auto-Submit: Brian Osman <brianosman@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12339 Change-Id: I53a8a6fef299da15d206d884ba7029820ffcff43 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465799 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-10-30 02:34:51 +00:00
array<half2x2, 3> m1 = array<half2x2, 3>{half2x2(1.0h), half2x2(2.0h), half2x2(half2(3.0h, 4.0h), half2(5.0h, 6.0h))};
array<half2x2, 3> m2 = array<half2x2, 3>{half2x2(1.0h), half2x2(2.0h), half2x2(half2(3.0h, 4.0h), half2(5.0h, 6.0h))};
array<half2x2, 3> m3 = array<half2x2, 3>{half2x2(1.0h), half2x2(half2(2.0h, 3.0h), half2(4.0h, 5.0h)), half2x2(6.0h)};
array<S, 3> s1 = array<S, 3>{S{1, 2}, S{3, 4}, S{5, 6}};
array<S, 3> s2 = array<S, 3>{S{1, 2}, S{0, 0}, S{5, 6}};
array<S, 3> s3 = array<S, 3>{S{1, 2}, S{3, 4}, S{5, 6}};
Reland "Fix array-of-matrix/struct comparisons in Metal." This is a reland of 23d8f94535813d7c973af69aaeb67a0e5d7c9140 Original change's description: > Fix array-of-matrix/struct comparisons in Metal. > > Metal needs helper functions in order to compare arrays, structs, and > matrices. Depending on the input code, it was possible for the > array-comparison helper to be emitted before a matrix-comparison > or struct-comparison helper. If this occurred, array comparisons of that > matrix or struct type would fail, because the operator== for the array's > inner type was defined after array==, and Metal (like C++) parses > top-to-bottom and only considers functions declared above the current > function. > > We now emit prototypes for all the array, struct and matrix helper > function. These prototypes are emitted above any helper functions. This > ensures visibility no matter how your comparisons are organized. > > Change-Id: Ib3d8828c301fd0fa6c209788f9ea60800371edbe > Bug: skia:12326 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437739 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:12326 Change-Id: Ife68020f6b01fae973b97f76099c6d5e8215636c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438296 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-08-10 20:03:23 +00:00
_out.sk_FragColor = ((((((f1 == f2 && f1 != f3) && v1 == v2) && v1 != v3) && m1 == m2) && m1 != m3) && s1 != s2) && s3 == s1 ? _uniforms.colorGreen : _uniforms.colorRed;
return _out;
}