skia2/tests/sksl/shared/StructsInFunctions.metal

105 lines
3.2 KiB
Metal
Raw Normal View History

#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
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 {
float4 f4;
int3 i3;
};
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 colorRed;
half4 colorGreen;
};
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
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);
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
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;
}
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);
}
thread bool operator==(thread const Nested& left, thread const Nested& 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.a == right.a) &&
all(left.b == right.b);
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 Nested& left, thread const Nested& right) {
return !(left == 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
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;
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;
_skOutParamHelper1_modifies_a_struct_vS(n3);
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{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;
}