AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2af58b0377
skia2/tests/sksl/shared/SwizzleBoolConstants.glsl

34 lines
1.2 KiB
Plaintext
Raw Normal View History

Add unit test for swizzling booleans. This test currently crashes skslc, but will be fixed in the followup CL. Change-Id: I3683d94a310242e8ca67560296518fd1223b28d0 Bug: oss-fuzz:25781 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318656 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-09-22 17:56:01 +00:00
Fix crash when swizzling a bvec with constant 0/1s. Code like bool4 result = val.xy01; Will now be converted to: bvec4 result = bvec4(val.xy, bool(0), bool(1)); Previously it tried to do this, but there isn't an implicit conversion from int to bool, so it was silently failing and adding nulls into the constructor: bvec4 result = bvec4(val.xy, $coerceToBool(0), $coerceToBool(1)); This CL also cleans up some related code that I was checking while trying to understand the nature of the error. Change-Id: I5b7d96760a03170ff78b46251c4182cc4e89836f Bug: oss-fuzz:25781 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318636 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-09-22 18:00:40 +00:00
out vec4 sk_FragColor;
void main() {
Add golden outputs for the Metal backend. This CL also updates the blend tests to use sk_FragColor instead of returning a half4, as the Metal backend assumes that a fragment processor's `main` will return void and always synthesizes a `return *_out;` at the end. (context link: https://osscs.corp.google.com/android/platform/superproject/+/master:external/skqp/src/sksl/SkSLMetalCodeGenerator.cpp;l=803;drc=842d31b14159626054e01dd32826563a8f4214bf ) BYPASS_INCLUSIVE_LANGUAGE_REASON=see http://b/168134166 Change-Id: I330a456bf25ee72d3a29c59cd624625378ae80a0 Bug: skia:10649, skia:10757, skia:10758, skia:10759, skia:10760, skia:10761, skia:10762 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319409 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-25 17:35:58 +00:00
bvec4 v = bvec4(sqrt(1.0) == 1.0);
Fix crash when swizzling a bvec with constant 0/1s. Code like bool4 result = val.xy01; Will now be converted to: bvec4 result = bvec4(val.xy, bool(0), bool(1)); Previously it tried to do this, but there isn't an implicit conversion from int to bool, so it was silently failing and adding nulls into the constructor: bvec4 result = bvec4(val.xy, $coerceToBool(0), $coerceToBool(1)); This CL also cleans up some related code that I was checking while trying to understand the nature of the error. Change-Id: I5b7d96760a03170ff78b46251c4182cc4e89836f Bug: oss-fuzz:25781 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318636 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-09-22 18:00:40 +00:00
bvec4 result;
result = bvec4(v.x, true, true, true);
result = bvec4(v.xy, false, true);
Flatten out constructors nested inside constructors. - float4(float2(1, 2), 3, 4) --> float4(1, 2, 3, 4) - half3(z, half2(fn(x), y*2)) --> half3(z, fn(x), y*2) Single-argument constructors will be ignored by this optimization; these might be casts or splats. This had an unexpected side benefit of simplifying some Metal output, as we need to output fewer Metal matrix construction helper functions when matrices use more simple scalars for construction. Change-Id: I0a161db060c107e35247901619291bf83801cb11 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/337400 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-11-22 04:26:07 +00:00
result = bvec4(v.x, true, true, false);
result = bvec4(false, v.y, true, true);
Fix crash when swizzling a bvec with constant 0/1s. Code like bool4 result = val.xy01; Will now be converted to: bvec4 result = bvec4(val.xy, bool(0), bool(1)); Previously it tried to do this, but there isn't an implicit conversion from int to bool, so it was silently failing and adding nulls into the constructor: bvec4 result = bvec4(val.xy, $coerceToBool(0), $coerceToBool(1)); This CL also cleans up some related code that I was checking while trying to understand the nature of the error. Change-Id: I5b7d96760a03170ff78b46251c4182cc4e89836f Bug: oss-fuzz:25781 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318636 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-09-22 18:00:40 +00:00
result = bvec4(v.xyz, true);
Flatten out constructors nested inside constructors. - float4(float2(1, 2), 3, 4) --> float4(1, 2, 3, 4) - half3(z, half2(fn(x), y*2)) --> half3(z, fn(x), y*2) Single-argument constructors will be ignored by this optimization; these might be casts or splats. This had an unexpected side benefit of simplifying some Metal output, as we need to output fewer Metal matrix construction helper functions when matrices use more simple scalars for construction. Change-Id: I0a161db060c107e35247901619291bf83801cb11 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/337400 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-11-22 04:26:07 +00:00
result = bvec4(v.xy, true, true);
result = bvec4(v.x, false, v.z, true);
result = bvec4(v.x, true, false, false);
result = bvec4(true, v.yz, false);
result = bvec4(false, v.y, true, false);
result = bvec4(true, true, v.z, false);
Fix crash when swizzling a bvec with constant 0/1s. Code like bool4 result = val.xy01; Will now be converted to: bvec4 result = bvec4(val.xy, bool(0), bool(1)); Previously it tried to do this, but there isn't an implicit conversion from int to bool, so it was silently failing and adding nulls into the constructor: bvec4 result = bvec4(val.xy, $coerceToBool(0), $coerceToBool(1)); This CL also cleans up some related code that I was checking while trying to understand the nature of the error. Change-Id: I5b7d96760a03170ff78b46251c4182cc4e89836f Bug: oss-fuzz:25781 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318636 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-09-22 18:00:40 +00:00
result = v;
Promote bool(k) to true/false during constant propagation. Cleaned up some nearby code while implementing this fix as well. Change-Id: Ic084451f0d9fc12169e1720a8889a290249eb5e9 Bug: skia:10750 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318796 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-09-22 20:39:48 +00:00
result = bvec4(v.xyz, true);
Allow swizzle optimizations to apply to any 'trivial' ctor fields. This allows swizzle removal to apply in more cases; in particular, we can now optimize away extra swizzles caused by zero/one swizzle- components quite effectively. The "trivial expression" code was lifted from the inliner. Some subtle changes in trivial-expression determination affect the inliner's results in boring, non-meaningful ways. In particular, multi-argument constructors containing all-constant values are now considered trivial, whereas previously only single-argument constructors made the trivial- ness cut. This allows the inliner to propagate some values that it wouldn't have before. Change-Id: I9a009b6803d9ac9595d65538252ba81c2b7166a7 Bug: skia:10954 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/336156 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-19 21:25:49 +00:00
result = bvec4(v.xy, false, v.w);
Promote bool(k) to true/false during constant propagation. Cleaned up some nearby code while implementing this fix as well. Change-Id: Ic084451f0d9fc12169e1720a8889a290249eb5e9 Bug: skia:10750 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318796 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-09-22 20:39:48 +00:00
result = bvec4(v.xy, true, false);
Allow swizzle optimizations to apply to any 'trivial' ctor fields. This allows swizzle removal to apply in more cases; in particular, we can now optimize away extra swizzles caused by zero/one swizzle- components quite effectively. The "trivial expression" code was lifted from the inliner. Some subtle changes in trivial-expression determination affect the inliner's results in boring, non-meaningful ways. In particular, multi-argument constructors containing all-constant values are now considered trivial, whereas previously only single-argument constructors made the trivial- ness cut. This allows the inliner to propagate some values that it wouldn't have before. Change-Id: I9a009b6803d9ac9595d65538252ba81c2b7166a7 Bug: skia:10954 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/336156 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-19 21:25:49 +00:00
result = bvec4(v.x, true, v.zw);
result = bvec4(v.x, false, v.z, true);
result = bvec4(v.x, true, true, v.w);
Optimize swizzled multiple-argument constructors. This will reorder constructors with swizzles applied, such as `half4(1, 2, 3, 4).xxyz` --> `half4(1, 1, 2, 3)` `half4(1, colRGB).yzwx` --> `half4(colRGB.x, colRGB.y, colRGB.z, 1)` Note that, depending on the swizzle components, some elements of the constructor may be duplicated and others may be eliminated. The optimizer makes sure to leave the swizzle alone if it would duplicate anything non-trivial, or if it would eliminate anything with a side effect. Change-Id: I470fda217ae8cf5828406b89a5696ca6aebf608d Bug: skia:10954 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/335860 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-19 16:06:47 +00:00
result = bvec4(v.x, true, false, true);
Allow swizzle optimizations to apply to any 'trivial' ctor fields. This allows swizzle removal to apply in more cases; in particular, we can now optimize away extra swizzles caused by zero/one swizzle- components quite effectively. The "trivial expression" code was lifted from the inliner. Some subtle changes in trivial-expression determination affect the inliner's results in boring, non-meaningful ways. In particular, multi-argument constructors containing all-constant values are now considered trivial, whereas previously only single-argument constructors made the trivial- ness cut. This allows the inliner to propagate some values that it wouldn't have before. Change-Id: I9a009b6803d9ac9595d65538252ba81c2b7166a7 Bug: skia:10954 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/336156 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-19 21:25:49 +00:00
result = bvec4(true, v.yzw);
result = bvec4(false, v.yz, true);
result = bvec4(false, v.y, true, v.w);
Optimize swizzled multiple-argument constructors. This will reorder constructors with swizzles applied, such as `half4(1, 2, 3, 4).xxyz` --> `half4(1, 1, 2, 3)` `half4(1, colRGB).yzwx` --> `half4(colRGB.x, colRGB.y, colRGB.z, 1)` Note that, depending on the swizzle components, some elements of the constructor may be duplicated and others may be eliminated. The optimizer makes sure to leave the swizzle alone if it would duplicate anything non-trivial, or if it would eliminate anything with a side effect. Change-Id: I470fda217ae8cf5828406b89a5696ca6aebf608d Bug: skia:10954 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/335860 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-19 16:06:47 +00:00
result = bvec4(true, v.y, true, true);
Allow swizzle optimizations to apply to any 'trivial' ctor fields. This allows swizzle removal to apply in more cases; in particular, we can now optimize away extra swizzles caused by zero/one swizzle- components quite effectively. The "trivial expression" code was lifted from the inliner. Some subtle changes in trivial-expression determination affect the inliner's results in boring, non-meaningful ways. In particular, multi-argument constructors containing all-constant values are now considered trivial, whereas previously only single-argument constructors made the trivial- ness cut. This allows the inliner to propagate some values that it wouldn't have before. Change-Id: I9a009b6803d9ac9595d65538252ba81c2b7166a7 Bug: skia:10954 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/336156 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-19 21:25:49 +00:00
result = bvec4(false, false, v.zw);
Optimize swizzled multiple-argument constructors. This will reorder constructors with swizzles applied, such as `half4(1, 2, 3, 4).xxyz` --> `half4(1, 1, 2, 3)` `half4(1, colRGB).yzwx` --> `half4(colRGB.x, colRGB.y, colRGB.z, 1)` Note that, depending on the swizzle components, some elements of the constructor may be duplicated and others may be eliminated. The optimizer makes sure to leave the swizzle alone if it would duplicate anything non-trivial, or if it would eliminate anything with a side effect. Change-Id: I470fda217ae8cf5828406b89a5696ca6aebf608d Bug: skia:10954 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/335860 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-19 16:06:47 +00:00
result = bvec4(false, false, v.z, true);
result = bvec4(false, true, true, v.w);
Fix crash when swizzling a bvec with constant 0/1s. Code like bool4 result = val.xy01; Will now be converted to: bvec4 result = bvec4(val.xy, bool(0), bool(1)); Previously it tried to do this, but there isn't an implicit conversion from int to bool, so it was silently failing and adding nulls into the constructor: bvec4 result = bvec4(val.xy, $coerceToBool(0), $coerceToBool(1)); This CL also cleans up some related code that I was checking while trying to understand the nature of the error. Change-Id: I5b7d96760a03170ff78b46251c4182cc4e89836f Bug: oss-fuzz:25781 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318636 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-09-22 18:00:40 +00:00
sk_FragColor = any(result) ? vec4(1.0) : vec4(0.0);
}
Reference in New Issue Copy Permalink