AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reland "Fix Metal codegen error with structs containing compound types."

Browse Source 
This reverts commit 3aaed99930.

Reason for revert: removing changes to PrecisionQualifiers

Original change's description:
> Revert "Fix Metal codegen error with structs containing compound types."
>
> This reverts commit 2a6c41571b.
>
> 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>
This commit is contained in:
John Stiles 2021-11-12 22:56:36 -05:00 committed by SkCQ
parent cf7be0f3a7
commit 6460541ee4
6 changed files with 251 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/sksl/shared/StructsInFunctions.sksl
View File

@ -6,6 +6,8 @@ struct S { float x; int y; };
struct Nested { S a, b; }; struct Nested { S a, b; };
struct Compound { float4 f4; int3 i3; };
S returns_a_struct() { S returns_a_struct() {
S s; S s;
s.x = 1; s.x = 1;
@ -40,8 +42,14 @@ half4 main(float2 coords) {
n3 = n2; n3 = n2;
modifies_a_struct(n3.b); 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) && bool valid = (x == 3) && (s.x == 2) && (s.y == 3) &&
(s == expected) && (s == S(2, 3)) && (s != returns_a_struct()) && (s == expected) && (s == S(2, 3)) && (s != returns_a_struct()) &&
(n1 == n2) && (n1 != n3) && (n3 == Nested(S(1, 2), S(2, 3))); (n1 == n2) && (n1 != n3) && (n3 == Nested(S(1, 2), S(2, 3))) &&
(c1 == c2) && (c2 != c3);
return valid ? colorGreen : colorRed; return valid ? colorGreen : colorRed;
} }

2
src/sksl/codegen/SkSLMetalCodeGenerator.cpp
View File

@ -1532,7 +1532,7 @@ thread bool operator!=(thread const %s& left, thread const %s& right);
const char* separator = ""; const char* separator = "";
for (const Type::Field& field : type.fields()) { for (const Type::Field& field : type.fields()) {
fExtraFunctions.printf("%s(left.%.*s == right.%.*s)", fExtraFunctions.printf("%sall(left.%.*s == right.%.*s)",
separator, separator,
(int)field.fName.size(), field.fName.data(), (int)field.fName.size(), field.fName.data(),
(int)field.fName.size(), field.fName.data()); (int)field.fName.size(), field.fName.data());

4
tests/sksl/shared/ArrayComparison.metal
View File

@ -48,8 +48,8 @@ thread bool operator!=(const half2x2 left, const half2x2 right) {
return !(left == right); return !(left == right);
} }
thread bool operator==(thread const S& left, thread const S& right) { thread bool operator==(thread const S& left, thread const S& right) {
return (left.x == right.x) && return all(left.x == right.x) &&
(left.y == right.y); all(left.y == right.y);
} }
thread bool operator!=(thread const S& left, thread const S& right) { thread bool operator!=(thread const S& left, thread const S& right) {
return !(left == right); return !(left == right);

340
tests/sksl/shared/StructsInFunctions.asm.frag
View File

@ -27,6 +27,12 @@ OpMemberName %Nested 1 "b"
OpName %n1 "n1" OpName %n1 "n1"
OpName %n2 "n2" OpName %n2 "n2"
OpName %n3 "n3" OpName %n3 "n3"
OpName %Compound "Compound"
OpMemberName %Compound 0 "f4"
OpMemberName %Compound 1 "i3"
OpName %c1 "c1"
OpName %c2 "c2"
OpName %c3 "c3"
OpName %valid "valid" OpName %valid "valid"
OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor RelaxedPrecision
OpDecorate %sk_FragColor Location 0 OpDecorate %sk_FragColor Location 0
@ -51,19 +57,29 @@ OpDecorate %84 RelaxedPrecision
OpDecorate %86 RelaxedPrecision OpDecorate %86 RelaxedPrecision
OpDecorate %87 RelaxedPrecision OpDecorate %87 RelaxedPrecision
OpDecorate %89 RelaxedPrecision OpDecorate %89 RelaxedPrecision
OpDecorate %113 RelaxedPrecision OpMemberDecorate %Compound 0 Offset 0
OpMemberDecorate %Compound 1 Offset 16
OpDecorate %108 RelaxedPrecision
OpDecorate %109 RelaxedPrecision
OpDecorate %114 RelaxedPrecision OpDecorate %114 RelaxedPrecision
OpDecorate %125 RelaxedPrecision OpDecorate %115 RelaxedPrecision
OpDecorate %137 RelaxedPrecision OpDecorate %137 RelaxedPrecision
OpDecorate %138 RelaxedPrecision
OpDecorate %149 RelaxedPrecision OpDecorate %149 RelaxedPrecision
OpDecorate %150 RelaxedPrecision OpDecorate %161 RelaxedPrecision
OpDecorate %173 RelaxedPrecision OpDecorate %173 RelaxedPrecision
OpDecorate %174 RelaxedPrecision OpDecorate %174 RelaxedPrecision
OpDecorate %197 RelaxedPrecision OpDecorate %197 RelaxedPrecision
OpDecorate %198 RelaxedPrecision
OpDecorate %221 RelaxedPrecision OpDecorate %221 RelaxedPrecision
OpDecorate %229 RelaxedPrecision OpDecorate %247 RelaxedPrecision
OpDecorate %231 RelaxedPrecision OpDecorate %248 RelaxedPrecision
OpDecorate %232 RelaxedPrecision OpDecorate %263 RelaxedPrecision
OpDecorate %264 RelaxedPrecision
OpDecorate %275 RelaxedPrecision
OpDecorate %282 RelaxedPrecision
OpDecorate %284 RelaxedPrecision
OpDecorate %285 RelaxedPrecision
%float = OpTypeFloat 32 %float = OpTypeFloat 32
%v4float = OpTypeVector %float 4 %v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float %_ptr_Output_v4float = OpTypePointer Output %v4float
@ -97,11 +113,22 @@ OpDecorate %232 RelaxedPrecision
%64 = OpTypeFunction %v4float %_ptr_Function_v2float %64 = OpTypeFunction %v4float %_ptr_Function_v2float
%Nested = OpTypeStruct %S %S %Nested = OpTypeStruct %S %S
%_ptr_Function_Nested = OpTypePointer Function %Nested %_ptr_Function_Nested = OpTypePointer Function %Nested
%v3int = OpTypeVector %int 3
%Compound = OpTypeStruct %v4float %v3int
%_ptr_Function_Compound = OpTypePointer Function %Compound
%float_3 = OpConstant %float 3
%float_4 = OpConstant %float 4
%99 = OpConstantComposite %v4float %float_1 %float_2 %float_3 %float_4
%int_5 = OpConstant %int 5
%int_6 = OpConstant %int 6
%int_7 = OpConstant %int 7
%103 = OpConstantComposite %v3int %int_5 %int_6 %int_7
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
%_ptr_Function_bool = OpTypePointer Function %bool %_ptr_Function_bool = OpTypePointer Function %bool
%false = OpConstantFalse %bool %false = OpConstantFalse %bool
%float_3 = OpConstant %float 3 %v4bool = OpTypeVector %bool 4
%v3bool = OpTypeVector %bool 3
%_ptr_Function_v4float = OpTypePointer Function %v4float %_ptr_Function_v4float = OpTypePointer Function %v4float
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
%_entrypoint_v = OpFunction %void None %19 %_entrypoint_v = OpFunction %void None %19
%20 = OpLabel %20 = OpLabel
%24 = OpVariable %_ptr_Function_v2float Function %24 = OpVariable %_ptr_Function_v2float Function
@ -160,8 +187,11 @@ OpFunctionEnd
%n2 = OpVariable %_ptr_Function_Nested Function %n2 = OpVariable %_ptr_Function_Nested Function
%n3 = OpVariable %_ptr_Function_Nested Function %n3 = OpVariable %_ptr_Function_Nested Function
%90 = OpVariable %_ptr_Function_S Function %90 = OpVariable %_ptr_Function_S Function
%c1 = OpVariable %_ptr_Function_Compound Function
%c2 = OpVariable %_ptr_Function_Compound Function
%c3 = OpVariable %_ptr_Function_Compound Function
%valid = OpVariable %_ptr_Function_bool Function %valid = OpVariable %_ptr_Function_bool Function
%222 = OpVariable %_ptr_Function_v4float Function %276 = OpVariable %_ptr_Function_v4float Function
%68 = OpFunctionCall %S %returns_a_struct_S %68 = OpFunctionCall %S %returns_a_struct_S
OpStore %s_0 %68 OpStore %s_0 %68
%70 = OpLoad %S %s_0 %70 = OpLoad %S %s_0
@ -188,169 +218,217 @@ OpStore %90 %89
%91 = OpFunctionCall %void %modifies_a_struct_vS %90 %91 = OpFunctionCall %void %modifies_a_struct_vS %90
%92 = OpLoad %S %90 %92 = OpLoad %S %90
OpStore %88 %92 OpStore %88 %92
%96 = OpLoad %float %x %104 = OpCompositeConstruct %Compound %99 %103
%98 = OpFOrdEqual %bool %96 %float_3 OpStore %c1 %104
OpSelectionMerge %100 None %106 = OpAccessChain %_ptr_Uniform_v4float %14 %int_1
OpBranchConditional %98 %99 %100 %108 = OpLoad %v4float %106
%99 = OpLabel %109 = OpCompositeExtract %float %108 1
%101 = OpAccessChain %_ptr_Function_float %s_0 %int_0 %110 = OpCompositeConstruct %v4float %109 %float_2 %float_3 %float_4
%102 = OpLoad %float %101 %111 = OpCompositeConstruct %Compound %110 %103
%103 = OpFOrdEqual %bool %102 %float_2 OpStore %c2 %111
OpBranch %100 %113 = OpAccessChain %_ptr_Uniform_v4float %14 %int_1
%100 = OpLabel %114 = OpLoad %v4float %113
%104 = OpPhi %bool %false %66 %103 %99 %115 = OpCompositeExtract %float %114 0
OpSelectionMerge %106 None %116 = OpCompositeConstruct %v4float %115 %float_2 %float_3 %float_4
OpBranchConditional %104 %105 %106 %117 = OpCompositeConstruct %Compound %116 %103
%105 = OpLabel OpStore %c3 %117
%107 = OpAccessChain %_ptr_Function_int %s_0 %int_1 %121 = OpLoad %float %x
%108 = OpLoad %int %107 %122 = OpFOrdEqual %bool %121 %float_3
%109 = OpIEqual %bool %108 %int_3
OpBranch %106
%106 = OpLabel
%110 = OpPhi %bool %false %100 %109 %105
OpSelectionMerge %112 None
OpBranchConditional %110 %111 %112
%111 = OpLabel
%113 = OpLoad %S %s_0
%114 = OpLoad %S %expected
%115 = OpCompositeExtract %float %113 0
%116 = OpCompositeExtract %float %114 0
%117 = OpFOrdEqual %bool %115 %116
%118 = OpCompositeExtract %int %113 1
%119 = OpCompositeExtract %int %114 1
%120 = OpIEqual %bool %118 %119
%121 = OpLogicalAnd %bool %120 %117
OpBranch %112
%112 = OpLabel
%122 = OpPhi %bool %false %106 %121 %111
OpSelectionMerge %124 None OpSelectionMerge %124 None
OpBranchConditional %122 %123 %124 OpBranchConditional %122 %123 %124
%123 = OpLabel %123 = OpLabel
%125 = OpLoad %S %s_0 %125 = OpAccessChain %_ptr_Function_float %s_0 %int_0
%126 = OpCompositeConstruct %S %float_2 %int_3 %126 = OpLoad %float %125
%127 = OpCompositeExtract %float %125 0 %127 = OpFOrdEqual %bool %126 %float_2
%128 = OpCompositeExtract %float %126 0
%129 = OpFOrdEqual %bool %127 %128
%130 = OpCompositeExtract %int %125 1
%131 = OpCompositeExtract %int %126 1
%132 = OpIEqual %bool %130 %131
%133 = OpLogicalAnd %bool %132 %129
OpBranch %124 OpBranch %124
%124 = OpLabel %124 = OpLabel
%134 = OpPhi %bool %false %112 %133 %123 %128 = OpPhi %bool %false %66 %127 %123
OpSelectionMerge %130 None
OpBranchConditional %128 %129 %130
%129 = OpLabel
%131 = OpAccessChain %_ptr_Function_int %s_0 %int_1
%132 = OpLoad %int %131
%133 = OpIEqual %bool %132 %int_3
OpBranch %130
%130 = OpLabel
%134 = OpPhi %bool %false %124 %133 %129
OpSelectionMerge %136 None OpSelectionMerge %136 None
OpBranchConditional %134 %135 %136 OpBranchConditional %134 %135 %136
%135 = OpLabel %135 = OpLabel
%137 = OpLoad %S %s_0 %137 = OpLoad %S %s_0
%138 = OpFunctionCall %S %returns_a_struct_S %138 = OpLoad %S %expected
%139 = OpCompositeExtract %float %137 0 %139 = OpCompositeExtract %float %137 0
%140 = OpCompositeExtract %float %138 0 %140 = OpCompositeExtract %float %138 0
%141 = OpFOrdNotEqual %bool %139 %140 %141 = OpFOrdEqual %bool %139 %140
%142 = OpCompositeExtract %int %137 1 %142 = OpCompositeExtract %int %137 1
%143 = OpCompositeExtract %int %138 1 %143 = OpCompositeExtract %int %138 1
%144 = OpINotEqual %bool %142 %143 %144 = OpIEqual %bool %142 %143
%145 = OpLogicalOr %bool %144 %141 %145 = OpLogicalAnd %bool %144 %141
OpBranch %136 OpBranch %136
%136 = OpLabel %136 = OpLabel
%146 = OpPhi %bool %false %124 %145 %135 %146 = OpPhi %bool %false %130 %145 %135
OpSelectionMerge %148 None OpSelectionMerge %148 None
OpBranchConditional %146 %147 %148 OpBranchConditional %146 %147 %148
%147 = OpLabel %147 = OpLabel
%149 = OpLoad %Nested %n1 %149 = OpLoad %S %s_0
%150 = OpLoad %Nested %n2 %150 = OpCompositeConstruct %S %float_2 %int_3
%151 = OpCompositeExtract %S %149 0 %151 = OpCompositeExtract %float %149 0
%152 = OpCompositeExtract %S %150 0 %152 = OpCompositeExtract %float %150 0
%153 = OpCompositeExtract %float %151 0 %153 = OpFOrdEqual %bool %151 %152
%154 = OpCompositeExtract %float %152 0 %154 = OpCompositeExtract %int %149 1
%155 = OpFOrdEqual %bool %153 %154 %155 = OpCompositeExtract %int %150 1
%156 = OpCompositeExtract %int %151 1 %156 = OpIEqual %bool %154 %155
%157 = OpCompositeExtract %int %152 1 %157 = OpLogicalAnd %bool %156 %153
%158 = OpIEqual %bool %156 %157
%159 = OpLogicalAnd %bool %158 %155
%160 = OpCompositeExtract %S %149 1
%161 = OpCompositeExtract %S %150 1
%162 = OpCompositeExtract %float %160 0
%163 = OpCompositeExtract %float %161 0
%164 = OpFOrdEqual %bool %162 %163
%165 = OpCompositeExtract %int %160 1
%166 = OpCompositeExtract %int %161 1
%167 = OpIEqual %bool %165 %166
%168 = OpLogicalAnd %bool %167 %164
%169 = OpLogicalAnd %bool %168 %159
OpBranch %148 OpBranch %148
%148 = OpLabel %148 = OpLabel
%170 = OpPhi %bool %false %136 %169 %147 %158 = OpPhi %bool %false %136 %157 %147
OpSelectionMerge %160 None
OpBranchConditional %158 %159 %160
%159 = OpLabel
%161 = OpLoad %S %s_0
%162 = OpFunctionCall %S %returns_a_struct_S
%163 = OpCompositeExtract %float %161 0
%164 = OpCompositeExtract %float %162 0
%165 = OpFOrdNotEqual %bool %163 %164
%166 = OpCompositeExtract %int %161 1
%167 = OpCompositeExtract %int %162 1
%168 = OpINotEqual %bool %166 %167
%169 = OpLogicalOr %bool %168 %165
OpBranch %160
%160 = OpLabel
%170 = OpPhi %bool %false %148 %169 %159
OpSelectionMerge %172 None OpSelectionMerge %172 None
OpBranchConditional %170 %171 %172 OpBranchConditional %170 %171 %172
%171 = OpLabel %171 = OpLabel
%173 = OpLoad %Nested %n1 %173 = OpLoad %Nested %n1
%174 = OpLoad %Nested %n3 %174 = OpLoad %Nested %n2
%175 = OpCompositeExtract %S %173 0 %175 = OpCompositeExtract %S %173 0
%176 = OpCompositeExtract %S %174 0 %176 = OpCompositeExtract %S %174 0
%177 = OpCompositeExtract %float %175 0 %177 = OpCompositeExtract %float %175 0
%178 = OpCompositeExtract %float %176 0 %178 = OpCompositeExtract %float %176 0
%179 = OpFOrdNotEqual %bool %177 %178 %179 = OpFOrdEqual %bool %177 %178
%180 = OpCompositeExtract %int %175 1 %180 = OpCompositeExtract %int %175 1
%181 = OpCompositeExtract %int %176 1 %181 = OpCompositeExtract %int %176 1
%182 = OpINotEqual %bool %180 %181 %182 = OpIEqual %bool %180 %181
%183 = OpLogicalOr %bool %182 %179 %183 = OpLogicalAnd %bool %182 %179
%184 = OpCompositeExtract %S %173 1 %184 = OpCompositeExtract %S %173 1
%185 = OpCompositeExtract %S %174 1 %185 = OpCompositeExtract %S %174 1
%186 = OpCompositeExtract %float %184 0 %186 = OpCompositeExtract %float %184 0
%187 = OpCompositeExtract %float %185 0 %187 = OpCompositeExtract %float %185 0
%188 = OpFOrdNotEqual %bool %186 %187 %188 = OpFOrdEqual %bool %186 %187
%189 = OpCompositeExtract %int %184 1 %189 = OpCompositeExtract %int %184 1
%190 = OpCompositeExtract %int %185 1 %190 = OpCompositeExtract %int %185 1
%191 = OpINotEqual %bool %189 %190 %191 = OpIEqual %bool %189 %190
%192 = OpLogicalOr %bool %191 %188 %192 = OpLogicalAnd %bool %191 %188
%193 = OpLogicalOr %bool %192 %183 %193 = OpLogicalAnd %bool %192 %183
OpBranch %172 OpBranch %172
%172 = OpLabel %172 = OpLabel
%194 = OpPhi %bool %false %148 %193 %171 %194 = OpPhi %bool %false %160 %193 %171
OpSelectionMerge %196 None OpSelectionMerge %196 None
OpBranchConditional %194 %195 %196 OpBranchConditional %194 %195 %196
%195 = OpLabel %195 = OpLabel
%197 = OpLoad %Nested %n3 %197 = OpLoad %Nested %n1
%198 = OpCompositeConstruct %S %float_1 %int_2 %198 = OpLoad %Nested %n3
%199 = OpCompositeConstruct %S %float_2 %int_3 %199 = OpCompositeExtract %S %197 0
%200 = OpCompositeConstruct %Nested %198 %199 %200 = OpCompositeExtract %S %198 0
%201 = OpCompositeExtract %S %197 0 %201 = OpCompositeExtract %float %199 0
%202 = OpCompositeExtract %S %200 0 %202 = OpCompositeExtract %float %200 0
%203 = OpCompositeExtract %float %201 0 %203 = OpFOrdNotEqual %bool %201 %202
%204 = OpCompositeExtract %float %202 0 %204 = OpCompositeExtract %int %199 1
%205 = OpFOrdEqual %bool %203 %204 %205 = OpCompositeExtract %int %200 1
%206 = OpCompositeExtract %int %201 1 %206 = OpINotEqual %bool %204 %205
%207 = OpCompositeExtract %int %202 1 %207 = OpLogicalOr %bool %206 %203
%208 = OpIEqual %bool %206 %207 %208 = OpCompositeExtract %S %197 1
%209 = OpLogicalAnd %bool %208 %205 %209 = OpCompositeExtract %S %198 1
%210 = OpCompositeExtract %S %197 1 %210 = OpCompositeExtract %float %208 0
%211 = OpCompositeExtract %S %200 1 %211 = OpCompositeExtract %float %209 0
%212 = OpCompositeExtract %float %210 0 %212 = OpFOrdNotEqual %bool %210 %211
%213 = OpCompositeExtract %float %211 0 %213 = OpCompositeExtract %int %208 1
%214 = OpFOrdEqual %bool %212 %213 %214 = OpCompositeExtract %int %209 1
%215 = OpCompositeExtract %int %210 1 %215 = OpINotEqual %bool %213 %214
%216 = OpCompositeExtract %int %211 1 %216 = OpLogicalOr %bool %215 %212
%217 = OpIEqual %bool %215 %216 %217 = OpLogicalOr %bool %216 %207
%218 = OpLogicalAnd %bool %217 %214
%219 = OpLogicalAnd %bool %218 %209
OpBranch %196 OpBranch %196
%196 = OpLabel %196 = OpLabel
%220 = OpPhi %bool %false %172 %219 %195 %218 = OpPhi %bool %false %172 %217 %195
OpStore %valid %220 OpSelectionMerge %220 None
%221 = OpLoad %bool %valid OpBranchConditional %218 %219 %220
OpSelectionMerge %226 None %219 = OpLabel
OpBranchConditional %221 %224 %225 %221 = OpLoad %Nested %n3
%224 = OpLabel %222 = OpCompositeConstruct %S %float_1 %int_2
%227 = OpAccessChain %_ptr_Uniform_v4float %14 %int_1 %223 = OpCompositeConstruct %S %float_2 %int_3
%229 = OpLoad %v4float %227 %224 = OpCompositeConstruct %Nested %222 %223
OpStore %222 %229 %225 = OpCompositeExtract %S %221 0
OpBranch %226 %226 = OpCompositeExtract %S %224 0
%225 = OpLabel %227 = OpCompositeExtract %float %225 0
%230 = OpAccessChain %_ptr_Uniform_v4float %14 %int_0 %228 = OpCompositeExtract %float %226 0
%231 = OpLoad %v4float %230 %229 = OpFOrdEqual %bool %227 %228
OpStore %222 %231 %230 = OpCompositeExtract %int %225 1
OpBranch %226 %231 = OpCompositeExtract %int %226 1
%226 = OpLabel %232 = OpIEqual %bool %230 %231
%232 = OpLoad %v4float %222 %233 = OpLogicalAnd %bool %232 %229
OpReturnValue %232 %234 = OpCompositeExtract %S %221 1
%235 = OpCompositeExtract %S %224 1
%236 = OpCompositeExtract %float %234 0
%237 = OpCompositeExtract %float %235 0
%238 = OpFOrdEqual %bool %236 %237
%239 = OpCompositeExtract %int %234 1
%240 = OpCompositeExtract %int %235 1
%241 = OpIEqual %bool %239 %240
%242 = OpLogicalAnd %bool %241 %238
%243 = OpLogicalAnd %bool %242 %233
OpBranch %220
%220 = OpLabel
%244 = OpPhi %bool %false %196 %243 %219
OpSelectionMerge %246 None
OpBranchConditional %244 %245 %246
%245 = OpLabel
%247 = OpLoad %Compound %c1
%248 = OpLoad %Compound %c2
%249 = OpCompositeExtract %v4float %247 0
%250 = OpCompositeExtract %v4float %248 0
%251 = OpFOrdEqual %v4bool %249 %250
%253 = OpAll %bool %251
%254 = OpCompositeExtract %v3int %247 1
%255 = OpCompositeExtract %v3int %248 1
%256 = OpIEqual %v3bool %254 %255
%258 = OpAll %bool %256
%259 = OpLogicalAnd %bool %258 %253
OpBranch %246
%246 = OpLabel
%260 = OpPhi %bool %false %220 %259 %245
OpSelectionMerge %262 None
OpBranchConditional %260 %261 %262
%261 = OpLabel
%263 = OpLoad %Compound %c2
%264 = OpLoad %Compound %c3
%265 = OpCompositeExtract %v4float %263 0
%266 = OpCompositeExtract %v4float %264 0
%267 = OpFOrdNotEqual %v4bool %265 %266
%268 = OpAny %bool %267
%269 = OpCompositeExtract %v3int %263 1
%270 = OpCompositeExtract %v3int %264 1
%271 = OpINotEqual %v3bool %269 %270
%272 = OpAny %bool %271
%273 = OpLogicalOr %bool %272 %268
OpBranch %262
%262 = OpLabel
%274 = OpPhi %bool %false %246 %273 %261
OpStore %valid %274
%275 = OpLoad %bool %valid
OpSelectionMerge %280 None
OpBranchConditional %275 %278 %279
%278 = OpLabel
%281 = OpAccessChain %_ptr_Uniform_v4float %14 %int_1
%282 = OpLoad %v4float %281
OpStore %276 %282
OpBranch %280
%279 = OpLabel
%283 = OpAccessChain %_ptr_Uniform_v4float %14 %int_0
%284 = OpLoad %v4float %283
OpStore %276 %284
OpBranch %280
%280 = OpLabel
%285 = OpLoad %v4float %276
OpReturnValue %285
OpFunctionEnd OpFunctionEnd

9
tests/sksl/shared/StructsInFunctions.glsl
View File

@ -10,6 +10,10 @@ struct Nested {
S a; S a;
S b; S b;
}; };
struct Compound {
vec4 f4;
ivec3 i3;
};
S returns_a_struct_S() { S returns_a_struct_S() {
S s; S s;
s.x = 1.0; s.x = 1.0;
@ -39,6 +43,9 @@ vec4 main() {
n2 = n1; n2 = n1;
n3 = n2; n3 = n2;
modifies_a_struct_vS(n3.b); modifies_a_struct_vS(n3.b);
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)); Compound c1 = Compound(vec4(1.0, 2.0, 3.0, 4.0), ivec3(5, 6, 7));
Compound c2 = Compound(vec4(colorGreen.y, 2.0, 3.0, 4.0), ivec3(5, 6, 7));
Compound c3 = Compound(vec4(colorGreen.x, 2.0, 3.0, 4.0), ivec3(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;
return valid ? colorGreen : colorRed; return valid ? colorGreen : colorRed;
} }

27
tests/sksl/shared/StructsInFunctions.metal
View File

@ -9,6 +9,10 @@ struct Nested {
S a; S a;
S b; S b;
}; };
struct Compound {
float4 f4;
int3 i3;
};
struct Uniforms { struct Uniforms {
half4 colorRed; half4 colorRed;
half4 colorGreen; half4 colorGreen;
@ -24,6 +28,9 @@ 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 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 modifies_a_struct_vS(thread S& s);
void _skOutParamHelper0_modifies_a_struct_vS(thread S& s) { void _skOutParamHelper0_modifies_a_struct_vS(thread S& s) {
S _var0 = s; S _var0 = s;
@ -37,19 +44,26 @@ void _skOutParamHelper1_modifies_a_struct_vS(thread Nested& n3) {
n3.b = _var0; n3.b = _var0;
} }
thread bool operator==(thread const S& left, thread const S& right) { thread bool operator==(thread const S& left, thread const S& right) {
return (left.x == right.x) && return all(left.x == right.x) &&
(left.y == right.y); all(left.y == right.y);
} }
thread bool operator!=(thread const S& left, thread const S& right) { thread bool operator!=(thread const S& left, thread const S& right) {
return !(left == right); return !(left == right);
} }
thread bool operator==(thread const Nested& left, thread const Nested& right) { thread bool operator==(thread const Nested& left, thread const Nested& right) {
return (left.a == right.a) && return all(left.a == right.a) &&
(left.b == right.b); all(left.b == right.b);
} }
thread bool operator!=(thread const Nested& left, thread const Nested& right) { thread bool operator!=(thread const Nested& left, thread const Nested& right) {
return !(left == 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 returns_a_struct_S() {
S s; S s;
s.x = 1.0; s.x = 1.0;
@ -81,7 +95,10 @@ fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _unifo
n2 = n1; n2 = n1;
n3 = n2; n3 = n2;
_skOutParamHelper1_modifies_a_struct_vS(n3); _skOutParamHelper1_modifies_a_struct_vS(n3);
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}}; 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; _out.sk_FragColor = valid ? _uniforms.colorGreen : _uniforms.colorRed;
return _out; return _out;
} }