dec5ff2286
This reverts commit9155b338bb. Reason for revert: disable test for GLSL + Adreno 6xx Original change's description: > Revert "Add ES3 intrinsics isinf/isnan to public SkSL ES3." > > This reverts commite43714f490. > > Reason for revert: Several Pixel (Adreno) devices failing the test > > Original change's description: > > Add ES3 intrinsics isinf/isnan to public SkSL ES3. > > > > The ES3 spec doesn't mandate that `isnan` actually has to do anything, > > so the Isnan test is not enabled. (It doesn't work on my personal > > machine unless I make the NaN detectable at compile-time.) > > > > We do not support these functions in constant-expressions, as we > > currently avoid optimizing anything into a non-finite value; we leave > > expressions alone if we calculate a NaN/inf result for their value. > > > > Change-Id: Ibfdfb47b6e6134165c8780db570de04a916d2bfa > > Bug: skia:12022 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441581 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com,skcq-be@skia-corp.google.com.iam.gserviceaccount.com > > Change-Id: I89899ed391aa870350d0452bab4a0fb75bd7be38 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:12022 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441716 > Reviewed-by: Brian Osman <brianosman@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> Bug: skia:12022, skia:12377 Change-Id: Ib149dbc1138feb3ee2bf6f7e31e9e8a9414560bc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441884 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
26 lines
1.0 KiB
Metal
26 lines
1.0 KiB
Metal
#include <metal_stdlib>
|
|
#include <simd/simd.h>
|
|
using namespace metal;
|
|
struct Uniforms {
|
|
float2x2 testMatrix2x2;
|
|
float4 colorGreen;
|
|
float4 colorRed;
|
|
};
|
|
struct Inputs {
|
|
};
|
|
struct Outputs {
|
|
float4 sk_FragColor [[color(0)]];
|
|
};
|
|
|
|
float4 float4_from_float2x2(float2x2 x) {
|
|
return float4(x[0].xy, x[1].xy);
|
|
}
|
|
fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
|
|
Outputs _out;
|
|
(void)_out;
|
|
float4 infiniteValue = float4_from_float2x2(_uniforms.testMatrix2x2) / _uniforms.colorGreen.x;
|
|
float4 finiteValue = float4_from_float2x2(_uniforms.testMatrix2x2) / _uniforms.colorGreen.y;
|
|
_out.sk_FragColor = ((((((isinf(infiniteValue.x) && all(isinf(infiniteValue.xy))) && all(isinf(infiniteValue.xyz))) && all(isinf(infiniteValue))) && !isinf(finiteValue.x)) && !any(isinf(finiteValue.xy))) && !any(isinf(finiteValue.xyz))) && !any(isinf(finiteValue)) ? _uniforms.colorGreen : _uniforms.colorRed;
|
|
return _out;
|
|
}
|