AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
0bd5578c31
skia2/resources/sksl/metal/OutParams.sksl

79 lines
2.6 KiB
Plaintext
Raw Normal View History

Use references instead of pointers for Metal out params. Pointers require decorating the variable with a * to read back the value, which the code generator did not properly handle. There was a special case to add the * but it only supported assignment into the variable, not reading back. References require no special decoration. This change fixes compile errors in Functions.sksl with the "bar" function. (This test marks `x` as an inout but never actually mutates it.) It also allows us to remove a special-case workaround for `frexp`, an intrinsic function which uses a reference for its out-parameter. Additionally, this CL adds a non-inlining copy of "OutParams.sksl" to the Metal test directory, as most of our tests which use out-parameters end up inlining all the code, which hides these sorts of bugs. Change-Id: I31c4db04f6b512b4cd4fe65b3347b82bdbf039cd Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341000 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-12-04 16:58:26 +00:00
/*#pragma settings NoInline*/
void out_half (out half v) { v = 1; }
void out_half2(out half2 v) { v = half2(2); }
void out_half3(out half3 v) { v = half3(3); }
void out_half4(out half4 v) { v = half4(4); }
void out_half2x2(out half2x2 v) { v = half2x2(2); }
void out_half3x3(out half3x3 v) { v = half3x3(3); }
void out_half4x4(out half4x4 v) { v = half4x4(4); }
void out_int (out int v) { v = 1; }
void out_int2(out int2 v) { v = int2(2); }
void out_int3(out int3 v) { v = int3(3); }
void out_int4(out int4 v) { v = int4(4); }
void out_float (out float v) { v = 1; }
void out_float2(out float2 v) { v = float2(2); }
void out_float3(out float3 v) { v = float3(3); }
void out_float4(out float4 v) { v = float4(4); }
void out_float2x2(out float2x2 v) { v = float2x2(2); }
void out_float3x3(out float3x3 v) { v = float3x3(3); }
void out_float4x4(out float4x4 v) { v = float4x4(4); }
void out_bool (out bool v) { v = true; }
void out_bool2(out bool2 v) { v = bool2(false); }
void out_bool3(out bool3 v) { v = bool3(true); }
void out_bool4(out bool4 v) { v = bool4(false); }
void main() {
half h; out_half (h);
half2 h2; out_half2(h2);
half3 h3; out_half3(h3);
half4 h4; out_half4(h4);
Detect cases in Metal where out params are swizzled. We will need to emit a helper function to work around this case, as GLSL supports swizzled out params, but Metal does not. In this CL, we do not yet synthesize the helper function, but we annotate the code with a comment indicating affected calls. (Of course, this will be replaced with a helper function in a followup CL) Even detecting a swizzle is actually an interesting problem, because index expressions are sometimes actually swizzles, depending on the type of the base expression. Also, the index or swizzle might be nested in several other valid assignable expressions. Change-Id: I8c74f9a7daec08eff1f32387f8b6b96851c1bd6e Bug: skia:10855 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341057 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-12-04 20:36:49 +00:00
out_half(h3[1]);
Use references instead of pointers for Metal out params. Pointers require decorating the variable with a * to read back the value, which the code generator did not properly handle. There was a special case to add the * but it only supported assignment into the variable, not reading back. References require no special decoration. This change fixes compile errors in Functions.sksl with the "bar" function. (This test marks `x` as an inout but never actually mutates it.) It also allows us to remove a special-case workaround for `frexp`, an intrinsic function which uses a reference for its out-parameter. Additionally, this CL adds a non-inlining copy of "OutParams.sksl" to the Metal test directory, as most of our tests which use out-parameters end up inlining all the code, which hides these sorts of bugs. Change-Id: I31c4db04f6b512b4cd4fe65b3347b82bdbf039cd Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341000 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-12-04 16:58:26 +00:00
out_half2(h3.xz);
out_half4(h4.zwxy);
sk_FragColor = half4(h, h2.x, h3.x, h4.x);
half2x2 h2x2; out_half2x2(h2x2);
half3x3 h3x3; out_half3x3(h3x3);
half4x4 h4x4; out_half4x4(h4x4);
out_half3(h3x3[1]);
Detect cases in Metal where out params are swizzled. We will need to emit a helper function to work around this case, as GLSL supports swizzled out params, but Metal does not. In this CL, we do not yet synthesize the helper function, but we annotate the code with a comment indicating affected calls. (Of course, this will be replaced with a helper function in a followup CL) Even detecting a swizzle is actually an interesting problem, because index expressions are sometimes actually swizzles, depending on the type of the base expression. Also, the index or swizzle might be nested in several other valid assignable expressions. Change-Id: I8c74f9a7daec08eff1f32387f8b6b96851c1bd6e Bug: skia:10855 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341057 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-12-04 20:36:49 +00:00
out_half4(h4x4[3].zwxy);
out_half2(h2x2[0]);
Use references instead of pointers for Metal out params. Pointers require decorating the variable with a * to read back the value, which the code generator did not properly handle. There was a special case to add the * but it only supported assignment into the variable, not reading back. References require no special decoration. This change fixes compile errors in Functions.sksl with the "bar" function. (This test marks `x` as an inout but never actually mutates it.) It also allows us to remove a special-case workaround for `frexp`, an intrinsic function which uses a reference for its out-parameter. Additionally, this CL adds a non-inlining copy of "OutParams.sksl" to the Metal test directory, as most of our tests which use out-parameters end up inlining all the code, which hides these sorts of bugs. Change-Id: I31c4db04f6b512b4cd4fe65b3347b82bdbf039cd Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341000 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-12-04 16:58:26 +00:00
sk_FragColor = half4(h2x2[0][0], h3x3[0][0], h4x4[0][0], 1);
int i; out_int (i);
int2 i2; out_int2(i2);
int3 i3; out_int3(i3);
int4 i4; out_int4(i4);
out_int3(i4.xyz);
sk_FragColor = half4(i, i2.x, i3.x, i4.x);
float f; out_float (f);
float2 f2; out_float2(f2);
float3 f3; out_float3(f3);
float4 f4; out_float4(f4);
out_float2(f3.xy);
Detect cases in Metal where out params are swizzled. We will need to emit a helper function to work around this case, as GLSL supports swizzled out params, but Metal does not. In this CL, we do not yet synthesize the helper function, but we annotate the code with a comment indicating affected calls. (Of course, this will be replaced with a helper function in a followup CL) Even detecting a swizzle is actually an interesting problem, because index expressions are sometimes actually swizzles, depending on the type of the base expression. Also, the index or swizzle might be nested in several other valid assignable expressions. Change-Id: I8c74f9a7daec08eff1f32387f8b6b96851c1bd6e Bug: skia:10855 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341057 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-12-04 20:36:49 +00:00
out_float(f2[0]);
Update tests which mix int and float types without casts. These need to change because type coercion in SkSL is about to become more strict in a followup CL; we are disallowing expressions that mix ints and floats without a cast. Change-Id: I0f6c3cba53fb67078f447345338262c153236c51 Bug: skia:11164 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/353102 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-13 18:50:18 +00:00
sk_FragColor = half4(f, f2.x, f3.x, f4.x);
Use references instead of pointers for Metal out params. Pointers require decorating the variable with a * to read back the value, which the code generator did not properly handle. There was a special case to add the * but it only supported assignment into the variable, not reading back. References require no special decoration. This change fixes compile errors in Functions.sksl with the "bar" function. (This test marks `x` as an inout but never actually mutates it.) It also allows us to remove a special-case workaround for `frexp`, an intrinsic function which uses a reference for its out-parameter. Additionally, this CL adds a non-inlining copy of "OutParams.sksl" to the Metal test directory, as most of our tests which use out-parameters end up inlining all the code, which hides these sorts of bugs. Change-Id: I31c4db04f6b512b4cd4fe65b3347b82bdbf039cd Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341000 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-12-04 16:58:26 +00:00
float2x2 f2x2; out_float2x2(f2x2);
float3x3 f3x3; out_float3x3(f3x3);
float4x4 f4x4; out_float4x4(f4x4);
out_float(f2x2[0][0]);
Detect cases in Metal where out params are swizzled. We will need to emit a helper function to work around this case, as GLSL supports swizzled out params, but Metal does not. In this CL, we do not yet synthesize the helper function, but we annotate the code with a comment indicating affected calls. (Of course, this will be replaced with a helper function in a followup CL) Even detecting a swizzle is actually an interesting problem, because index expressions are sometimes actually swizzles, depending on the type of the base expression. Also, the index or swizzle might be nested in several other valid assignable expressions. Change-Id: I8c74f9a7daec08eff1f32387f8b6b96851c1bd6e Bug: skia:10855 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341057 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-12-04 20:36:49 +00:00
out_float4(f4x4[1]);
Update tests which mix int and float types without casts. These need to change because type coercion in SkSL is about to become more strict in a followup CL; we are disallowing expressions that mix ints and floats without a cast. Change-Id: I0f6c3cba53fb67078f447345338262c153236c51 Bug: skia:11164 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/353102 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-13 18:50:18 +00:00
sk_FragColor = half4(f2x2[0][0], f3x3[0][0], f4x4[0][0], 1);
Use references instead of pointers for Metal out params. Pointers require decorating the variable with a * to read back the value, which the code generator did not properly handle. There was a special case to add the * but it only supported assignment into the variable, not reading back. References require no special decoration. This change fixes compile errors in Functions.sksl with the "bar" function. (This test marks `x` as an inout but never actually mutates it.) It also allows us to remove a special-case workaround for `frexp`, an intrinsic function which uses a reference for its out-parameter. Additionally, this CL adds a non-inlining copy of "OutParams.sksl" to the Metal test directory, as most of our tests which use out-parameters end up inlining all the code, which hides these sorts of bugs. Change-Id: I31c4db04f6b512b4cd4fe65b3347b82bdbf039cd Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341000 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-12-04 16:58:26 +00:00
bool b; out_bool (b);
bool2 b2; out_bool2(b2);
bool3 b3; out_bool3(b3);
bool4 b4; out_bool4(b4);
out_bool2(b4.xw);
Detect cases in Metal where out params are swizzled. We will need to emit a helper function to work around this case, as GLSL supports swizzled out params, but Metal does not. In this CL, we do not yet synthesize the helper function, but we annotate the code with a comment indicating affected calls. (Of course, this will be replaced with a helper function in a followup CL) Even detecting a swizzle is actually an interesting problem, because index expressions are sometimes actually swizzles, depending on the type of the base expression. Also, the index or swizzle might be nested in several other valid assignable expressions. Change-Id: I8c74f9a7daec08eff1f32387f8b6b96851c1bd6e Bug: skia:10855 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341057 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-12-04 20:36:49 +00:00
out_bool(b3[2]);
Update tests which mix int and float types without casts. These need to change because type coercion in SkSL is about to become more strict in a followup CL; we are disallowing expressions that mix ints and floats without a cast. Change-Id: I0f6c3cba53fb67078f447345338262c153236c51 Bug: skia:11164 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/353102 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-13 18:50:18 +00:00
sk_FragColor = half4(b, b2.x, b3.x, b4.x);
Use references instead of pointers for Metal out params. Pointers require decorating the variable with a * to read back the value, which the code generator did not properly handle. There was a special case to add the * but it only supported assignment into the variable, not reading back. References require no special decoration. This change fixes compile errors in Functions.sksl with the "bar" function. (This test marks `x` as an inout but never actually mutates it.) It also allows us to remove a special-case workaround for `frexp`, an intrinsic function which uses a reference for its out-parameter. Additionally, this CL adds a non-inlining copy of "OutParams.sksl" to the Metal test directory, as most of our tests which use out-parameters end up inlining all the code, which hides these sorts of bugs. Change-Id: I31c4db04f6b512b4cd4fe65b3347b82bdbf039cd Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341000 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-12-04 16:58:26 +00:00
}
Reference in New Issue Copy Permalink