AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
edac7716aa
skia2/tests/sksl/intrinsics/OuterProduct.metal

41 lines
1.7 KiB
Metal
Raw Normal View History

Revert "Only include header once in combined MSL shader." This reverts commit e7a8f85e4f224d49323689a346e68196b40b7d65. Reason for revert: must revert dependent CL Original change's description: > Only include header once in combined MSL shader. > > Bug: skia:11389 > Change-Id: I3e24dcaa2cfeddc7efd7985f9f42a59bfc8175f2 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385137 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: Jim Van Verth <jvanverth@google.com> TBR=jvanverth@google.com,johnstiles@google.com Change-Id: I7a886b6c57a666e54e65365e41dcb57bd9ab4ba6 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:11389 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385237 Reviewed-by: Michael Ludwig <michaelludwig@google.com> Commit-Queue: Michael Ludwig <michaelludwig@google.com>
2021-03-16 14:40:11 +00:00
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
struct Uniforms {
Fix 4x4 outerProduct, and add unit tests. We are still missing an implementation for Metal and SPIR-V, but at least it's correct on GLSL now. Change-Id: I5b365384eaefacb00faf6af7bda9b690cba00de5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345397 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-12-17 17:34:46 +00:00
float2 h2;
float3 h3;
float4 h4;
float2 f2;
float3 f3;
float4 f4;
};
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
struct Inputs {
};
Fix 4x4 outerProduct, and add unit tests. We are still missing an implementation for Metal and SPIR-V, but at least it's correct on GLSL now. Change-Id: I5b365384eaefacb00faf6af7bda9b690cba00de5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345397 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-12-17 17:34:46 +00:00
struct Outputs {
float4 sk_FragColor [[color(0)]];
};
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
Remove unnecessary _out pointer in Metal. Like _globals, it's not actually necessary to indirect through a separate pointer at all. The output struct is now passed by reference and the additional pointer variable is removed. (Additionally, renamed _skGlobals back to _globals.) Change-Id: Id089a20cb751cdaedc48462a52da78ee43783611 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355632 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-19 18:07:55 +00:00
Outputs _out;
Squelch Metal warnings about unused _globals/_out. Change-Id: I84e546184d1ce8261602346d2c91c580b30e9b6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357001 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Adlai Holler <adlai@google.com> Reviewed-by: Adlai Holler <adlai@google.com>
2021-01-22 03:24:28 +00:00
(void)_out;
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
_out.sk_FragColor = outerProduct(_uniforms.f2, _uniforms.f2)[1].xyyy;
_out.sk_FragColor = outerProduct(_uniforms.f3, _uniforms.f3)[2].xyzz;
_out.sk_FragColor = outerProduct(_uniforms.f4, _uniforms.f4)[3];
_out.sk_FragColor = outerProduct(_uniforms.f3, _uniforms.f2)[1].xyzz;
_out.sk_FragColor = outerProduct(_uniforms.f2, _uniforms.f3)[2].xyyy;
_out.sk_FragColor = outerProduct(_uniforms.f4, _uniforms.f2)[1];
_out.sk_FragColor = outerProduct(_uniforms.f2, _uniforms.f4)[3].xyyy;
_out.sk_FragColor = outerProduct(_uniforms.f4, _uniforms.f3)[2];
_out.sk_FragColor = outerProduct(_uniforms.f3, _uniforms.f4)[3].xyzz;
_out.sk_FragColor = outerProduct(_uniforms.h2, _uniforms.h2)[1].xyyy;
_out.sk_FragColor = outerProduct(_uniforms.h3, _uniforms.h3)[2].xyzz;
_out.sk_FragColor = outerProduct(_uniforms.h4, _uniforms.h4)[3];
_out.sk_FragColor = outerProduct(_uniforms.h3, _uniforms.h2)[1].xyzz;
_out.sk_FragColor = outerProduct(_uniforms.h2, _uniforms.h3)[2].xyyy;
_out.sk_FragColor = outerProduct(_uniforms.h4, _uniforms.h2)[1];
_out.sk_FragColor = outerProduct(_uniforms.h2, _uniforms.h4)[3].xyyy;
_out.sk_FragColor = outerProduct(_uniforms.h4, _uniforms.h3)[2];
_out.sk_FragColor = outerProduct(_uniforms.h3, _uniforms.h4)[3].xyzz;
Remove unnecessary _out pointer in Metal. Like _globals, it's not actually necessary to indirect through a separate pointer at all. The output struct is now passed by reference and the additional pointer variable is removed. (Additionally, renamed _skGlobals back to _globals.) Change-Id: Id089a20cb751cdaedc48462a52da78ee43783611 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355632 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-19 18:07:55 +00:00
return _out;
Fix 4x4 outerProduct, and add unit tests. We are still missing an implementation for Metal and SPIR-V, but at least it's correct on GLSL now. Change-Id: I5b365384eaefacb00faf6af7bda9b690cba00de5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345397 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-12-17 17:34:46 +00:00
}
Reference in New Issue Copy Permalink