AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
b25560a1e1
skia2/tests/SkSLTest.cpp

318 lines
18 KiB
C++
Raw Normal View History

Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
/*
* Copyright 2021 Google LLC
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "gm/gm.h"
#include "include/core/SkBitmap.h"
#include "include/core/SkCanvas.h"
#include "include/core/SkData.h"
#include "include/core/SkFont.h"
#include "include/core/SkPaint.h"
#include "include/core/SkSize.h"
#include "include/core/SkString.h"
#include "include/core/SkSurface.h"
#include "include/effects/SkGradientShader.h"
#include "include/effects/SkImageFilters.h"
#include "include/effects/SkRuntimeEffect.h"
Made SkSL DSL into public API In addition to the unsurprising changes to eliminate references to src/, we also had to tighten up some C++17-isms as they are not permitted in public headers. Change-Id: Ie5005a33d7a135e69fb66beca5e7a5f960dbd453 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378496 Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 19:30:25 +00:00
#include "include/private/SkSLDefines.h" // for kDefaultInlineThreshold
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
#include "include/utils/SkRandom.h"
Reland "Convert GrDitherEffect to a runtime FP" This reverts commit 3dd52c758b6cbcf1bf6eca1d0a594195e770d2ef. Change-Id: Ie873ad570ffc57b3edd6ffe8612cbc2c73d40450 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/424259 Reviewed-by: Brian Osman <brianosman@google.com>
2021-07-02 14:17:45 +00:00
#include "src/core/SkRuntimeEffectPriv.h"
Loosen ES3 restrictions in Runtime Effects for debugging. This CL adds a RuntimeEffect option flag which skips over the various `strictES2Mode` checks sprinkled throughout IR generation. Runtime Effects still won't allow a lot of ES3 things (the Pipeline stage will reject unsupported statement types, SkVM doesn't support most non-ES2 constructs, etc). However, this change will give us the ability to test many more features involving arrays and structs that previously were off-limits due to ES2 restrictions, and will shore up some legitimate gaps in our testing. This is a useful starting point to allow for improved test coverage. Change-Id: I4a5bc43914e65fc7e59f1cecb76a0ec5a7f05f2f Bug: skia:11209 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402157 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>
2021-04-28 19:14:09 +00:00
#include "src/gpu/GrCaps.h"
#include "src/gpu/GrDirectContextPriv.h"
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
#include "tests/Test.h"
#include "tools/Resources.h"
#include "tools/ToolUtils.h"
static const SkRect kRect = SkRect::MakeWH(1, 1);
Add helper uniforms to Runtime Effect tests. This lets us use descriptive names like `colorRed` and `colorGreen` instead of `half4(1,0,0,1)` and `half4(0,1,0,1)`. It also lets us use actual unknown values instead of synthesizing sorta-kinda-unknowns by calling sqrt. Change-Id: I61481c33b7ff42182955777b05cfa5fcc13e0efc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359567 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 21:28:12 +00:00
template <typename T>
static void set_uniform(SkRuntimeShaderBuilder* builder, const char* name, const T& value) {
SkRuntimeShaderBuilder::BuilderUniform uniform = builder->uniform(name);
if (uniform.fVar) {
uniform = value;
}
}
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
static void test_one_permutation(skiatest::Reporter* r,
SkSurface* surface,
const char* testFile,
const char* permutationSuffix,
const SkRuntimeEffect::Options& options) {
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
SkString resourcePath = SkStringPrintf("sksl/%s", testFile);
sk_sp<SkData> shaderData = GetResourceAsData(resourcePath.c_str());
if (!shaderData) {
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
ERRORF(r, "%s%s: Unable to load file", testFile, permutationSuffix);
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
return;
}
SkString shaderString{reinterpret_cast<const char*>(shaderData->bytes()), shaderData->size()};
Reland "Add coords parameter to all .sksl test files used as runtime effects" This is a reland of 22dcb5fd7e4ab2a7a1a827165899a54342d2ed53 Original change's description: > Add coords parameter to all .sksl test files used as runtime effects > > Convert to use the newer MakeForShader factory, which requires this. > > Change-Id: Ifaf6054054027c78f3f3fe15596e435e0f79b877 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399336 > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: John Stiles <johnstiles@google.com> Bug: skia:11919 Change-Id: I5f745c54b2bc3712f2281db6e067345903e81931 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/401836 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-04-21 18:27:08 +00:00
SkRuntimeEffect::Result result = SkRuntimeEffect::MakeForShader(shaderString, options);
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
if (!result.effect) {
ERRORF(r, "%s%s: %s", testFile, permutationSuffix, result.errorText.c_str());
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
return;
}
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
SkRuntimeShaderBuilder builder(result.effect);
Reland "Add some SkSL intrinsics to our dm tests." This reverts commit b576168c8ca86daa494f2d64f2967e83bd65efa9. Reason for revert: disabled floor test due to undiagnosed ANGLE + DX9 + Intel6000 failures Original change's description: > Revert "Add some SkSL intrinsics to our dm tests." > > This reverts commit 0492a744a52db0eaf360d2d3fce3ec5ca75dc5f0. > > Reason for revert: Intel HD6000 + ANGLE DX9 fails the floor() test. > > Original change's description: > > Add some SkSL intrinsics to our dm tests. > > > > This CL adds dm coverage for: > > - abs(half) > > - sign(half) > > - floor > > - ceil > > > > And creates test output for abs(int) and sign(int); these aren't covered > > by dm because they don't exist in ES2 and so are unsupported by Runtime > > Effects. > > > > Change-Id: Ia3e660408cef50dec8fa4b6bdc12906e96179f6e > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360419 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I62121efee9315b16e61e7d38659b6f629bdf8bd8 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362056 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I22f22f631d85d93a8fe5686a99311ec2cf85fa4d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362103 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 16:44:13 +00:00
set_uniform(&builder, "colorBlack", SkV4{0, 0, 0, 1});
set_uniform(&builder, "colorRed", SkV4{1, 0, 0, 1});
set_uniform(&builder, "colorGreen", SkV4{0, 1, 0, 1});
set_uniform(&builder, "colorBlue", SkV4{0, 0, 1, 1});
set_uniform(&builder, "colorWhite", SkV4{1, 1, 1, 1});
set_uniform(&builder, "testInputs", SkV4{-1.25, 0, 0.75, 2.25});
Reland "Add support for matrix == and != in Metal shaders." This reverts commit 4908a24d4b24ad34a3dce693d931654b872bff08. Reason for revert: test fails on Adreno 5xx/6xx, will land tests separately and disable on Adreno Original change's description: > Revert "Add support for matrix == and != in Metal shaders." > > This reverts commit c50185718830a6220b28be885cebd3959a0f0698. > > Reason for revert: breaking many bots > > Original change's description: > > Add support for matrix == and != in Metal shaders. > > > > We need to polyfill an operator== and != when these are first > > encountered in the code. > > > > Change-Id: I539c838ee1871bcb0c4b66abb8a4a0f91146cd4f > > Bug: skia:11306 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368496 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: Id583109a0d167c2c58a57644b14cd5f49d670737 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:11306 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368801 > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Bug: skia:11306 Change-Id: If7c628b8c7a2ce40d6c88599a7660ff91c4ac67a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368804 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-10 14:53:41 +00:00
set_uniform(&builder, "testMatrix2x2", std::array<float,4>{1, 2,
3, 4});
set_uniform(&builder, "testMatrix3x3", std::array<float,9>{1, 2, 3,
4, 5, 6,
7, 8, 9});
Reland "Add some SkSL intrinsics to our dm tests." This reverts commit b576168c8ca86daa494f2d64f2967e83bd65efa9. Reason for revert: disabled floor test due to undiagnosed ANGLE + DX9 + Intel6000 failures Original change's description: > Revert "Add some SkSL intrinsics to our dm tests." > > This reverts commit 0492a744a52db0eaf360d2d3fce3ec5ca75dc5f0. > > Reason for revert: Intel HD6000 + ANGLE DX9 fails the floor() test. > > Original change's description: > > Add some SkSL intrinsics to our dm tests. > > > > This CL adds dm coverage for: > > - abs(half) > > - sign(half) > > - floor > > - ceil > > > > And creates test output for abs(int) and sign(int); these aren't covered > > by dm because they don't exist in ES2 and so are unsupported by Runtime > > Effects. > > > > Change-Id: Ia3e660408cef50dec8fa4b6bdc12906e96179f6e > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360419 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I62121efee9315b16e61e7d38659b6f629bdf8bd8 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362056 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I22f22f631d85d93a8fe5686a99311ec2cf85fa4d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362103 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 16:44:13 +00:00
set_uniform(&builder, "unknownInput", 1.0f);
Add SkSL test for matrix equality/inequality operators. Disabled on Adreno 5xx/6xx as the tests do not pass on those GPUs: http://screen/3Dkgs9syj37cjBV Change-Id: Ib935d01e8f06dbfe7decd5cc4e52e0688b48be08 Bug: skia:11306, skia:11308 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368805 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-10 17:21:51 +00:00
set_uniform(&builder, "testMatrix2x2", std::array<float,4>{1, 2,
3, 4});
set_uniform(&builder, "testMatrix3x3", std::array<float,9>{1, 2, 3,
4, 5, 6,
7, 8, 9});
Add helper uniforms to Runtime Effect tests. This lets us use descriptive names like `colorRed` and `colorGreen` instead of `half4(1,0,0,1)` and `half4(0,1,0,1)`. It also lets us use actual unknown values instead of synthesizing sorta-kinda-unknowns by calling sqrt. Change-Id: I61481c33b7ff42182955777b05cfa5fcc13e0efc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359567 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 21:28:12 +00:00
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
sk_sp<SkShader> shader = builder.makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/true);
if (!shader) {
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
ERRORF(r, "%s%s: Unable to build shader", testFile, permutationSuffix);
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
return;
}
SkPaint paintShader;
paintShader.setShader(shader);
surface->getCanvas()->drawRect(kRect, paintShader);
SkBitmap bitmap;
REPORTER_ASSERT(r, bitmap.tryAllocPixels(surface->imageInfo()));
REPORTER_ASSERT(r, surface->readPixels(bitmap.info(), bitmap.getPixels(), bitmap.rowBytes(),
/*srcX=*/0, /*srcY=*/0));
SkColor color = bitmap.getColor(0, 0);
REPORTER_ASSERT(r, color == SkColorSetARGB(0xFF, 0x00, 0xFF, 0x00),
"Expected: solid green. Actual: A=%02X R=%02X G=%02X B=%02X.",
SkColorGetA(color), SkColorGetR(color), SkColorGetG(color), SkColorGetB(color));
}
Loosen ES3 restrictions in Runtime Effects for debugging. This CL adds a RuntimeEffect option flag which skips over the various `strictES2Mode` checks sprinkled throughout IR generation. Runtime Effects still won't allow a lot of ES3 things (the Pipeline stage will reject unsupported statement types, SkVM doesn't support most non-ES2 constructs, etc). However, this change will give us the ability to test many more features involving arrays and structs that previously were off-limits due to ES2 restrictions, and will shore up some legitimate gaps in our testing. This is a useful starting point to allow for improved test coverage. Change-Id: I4a5bc43914e65fc7e59f1cecb76a0ec5a7f05f2f Bug: skia:11209 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402157 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>
2021-04-28 19:14:09 +00:00
static void test_permutations(skiatest::Reporter* r,
SkSurface* surface,
const char* testFile,
bool worksInES2) {
Reland "Convert GrDitherEffect to a runtime FP" This reverts commit 3dd52c758b6cbcf1bf6eca1d0a594195e770d2ef. Change-Id: Ie873ad570ffc57b3edd6ffe8612cbc2c73d40450 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/424259 Reviewed-by: Brian Osman <brianosman@google.com>
2021-07-02 14:17:45 +00:00
SkRuntimeEffect::Options options =
worksInES2 ? SkRuntimeEffect::Options{} : SkRuntimeEffectPriv::ES3Options();
Fix testing of Runtime Effects with inlining enabled and disabled. Previously, the act of painting a Runtime Effect was causing its helper functions to get inlined, even if inlining was disabled during the initial SkSL generation. This meant that the "NoInline" path was not actually very effective. Change-Id: If8e3933be61df4a49d2e11d916d7fff22876315e Bug: skia:11362 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388099 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 13:25:33 +00:00
options.forceNoInline = false;
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
test_one_permutation(r, surface, testFile, "", options);
Fix testing of Runtime Effects with inlining enabled and disabled. Previously, the act of painting a Runtime Effect was causing its helper functions to get inlined, even if inlining was disabled during the initial SkSL generation. This meant that the "NoInline" path was not actually very effective. Change-Id: If8e3933be61df4a49d2e11d916d7fff22876315e Bug: skia:11362 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388099 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 13:25:33 +00:00
options.forceNoInline = true;
test_one_permutation(r, surface, testFile, " (NoInline)", options);
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
}
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
static void test_cpu(skiatest::Reporter* r, const char* testFile) {
const SkImageInfo info = SkImageInfo::MakeN32Premul(kRect.width(), kRect.height());
sk_sp<SkSurface> surface(SkSurface::MakeRaster(info));
Loosen ES3 restrictions in Runtime Effects for debugging. This CL adds a RuntimeEffect option flag which skips over the various `strictES2Mode` checks sprinkled throughout IR generation. Runtime Effects still won't allow a lot of ES3 things (the Pipeline stage will reject unsupported statement types, SkVM doesn't support most non-ES2 constructs, etc). However, this change will give us the ability to test many more features involving arrays and structs that previously were off-limits due to ES2 restrictions, and will shore up some legitimate gaps in our testing. This is a useful starting point to allow for improved test coverage. Change-Id: I4a5bc43914e65fc7e59f1cecb76a0ec5a7f05f2f Bug: skia:11209 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402157 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>
2021-04-28 19:14:09 +00:00
test_permutations(r, surface.get(), testFile, /*worksInES2=*/true);
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
}
static void test_gpu(skiatest::Reporter* r, GrDirectContext* ctx, const char* testFile) {
const SkImageInfo info = SkImageInfo::MakeN32Premul(kRect.width(), kRect.height());
sk_sp<SkSurface> surface(SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info));
Loosen ES3 restrictions in Runtime Effects for debugging. This CL adds a RuntimeEffect option flag which skips over the various `strictES2Mode` checks sprinkled throughout IR generation. Runtime Effects still won't allow a lot of ES3 things (the Pipeline stage will reject unsupported statement types, SkVM doesn't support most non-ES2 constructs, etc). However, this change will give us the ability to test many more features involving arrays and structs that previously were off-limits due to ES2 restrictions, and will shore up some legitimate gaps in our testing. This is a useful starting point to allow for improved test coverage. Change-Id: I4a5bc43914e65fc7e59f1cecb76a0ec5a7f05f2f Bug: skia:11209 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402157 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>
2021-04-28 19:14:09 +00:00
test_permutations(r, surface.get(), testFile, /*worksInES2=*/true);
}
static void test_es3(skiatest::Reporter* r, GrDirectContext* ctx, const char* testFile) {
Expose non-square matrix types when fEnforceES2Restrictions is off. This will allow us to write tests that verify the behavior of non-square matrix ops. Change-Id: I1490c4675778cbdc8428ac7a6c9de16083179fc8 Bug: skia:11985 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/408645 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>
2021-05-14 16:15:01 +00:00
// We don't have an ES2 caps bit, so we check the caps bits for features that ES2 explicitly
// doesn't support. Our ES2 bots should return false for these.
Loosen ES3 restrictions in Runtime Effects for debugging. This CL adds a RuntimeEffect option flag which skips over the various `strictES2Mode` checks sprinkled throughout IR generation. Runtime Effects still won't allow a lot of ES3 things (the Pipeline stage will reject unsupported statement types, SkVM doesn't support most non-ES2 constructs, etc). However, this change will give us the ability to test many more features involving arrays and structs that previously were off-limits due to ES2 restrictions, and will shore up some legitimate gaps in our testing. This is a useful starting point to allow for improved test coverage. Change-Id: I4a5bc43914e65fc7e59f1cecb76a0ec5a7f05f2f Bug: skia:11209 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402157 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>
2021-04-28 19:14:09 +00:00
if (!ctx->priv().caps()->shaderCaps()->shaderDerivativeSupport() ||
Expose non-square matrix types when fEnforceES2Restrictions is off. This will allow us to write tests that verify the behavior of non-square matrix ops. Change-Id: I1490c4675778cbdc8428ac7a6c9de16083179fc8 Bug: skia:11985 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/408645 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>
2021-05-14 16:15:01 +00:00
!ctx->priv().caps()->shaderCaps()->integerSupport() ||
!ctx->priv().caps()->shaderCaps()->nonsquareMatrixSupport()) {
Loosen ES3 restrictions in Runtime Effects for debugging. This CL adds a RuntimeEffect option flag which skips over the various `strictES2Mode` checks sprinkled throughout IR generation. Runtime Effects still won't allow a lot of ES3 things (the Pipeline stage will reject unsupported statement types, SkVM doesn't support most non-ES2 constructs, etc). However, this change will give us the ability to test many more features involving arrays and structs that previously were off-limits due to ES2 restrictions, and will shore up some legitimate gaps in our testing. This is a useful starting point to allow for improved test coverage. Change-Id: I4a5bc43914e65fc7e59f1cecb76a0ec5a7f05f2f Bug: skia:11209 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402157 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>
2021-04-28 19:14:09 +00:00
return;
}
// ES3-only tests never run on the CPU, because SkVM lacks support for many non-ES2 features.
const SkImageInfo info = SkImageInfo::MakeN32Premul(kRect.width(), kRect.height());
sk_sp<SkSurface> surface(SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info));
test_permutations(r, surface.get(), testFile, /*worksInES2=*/false);
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
}
Reland "Improve support for arrays in Metal." This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b. Reason for revert: updated ArrayTypes test for ES2 compatibility Original change's description: > Revert "Improve support for arrays in Metal." > > This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2. > > Reason for revert: breaks ANGLE > > Original change's description: > > Improve support for arrays in Metal. > > > > Arrays in Metal now use the `array<T, N>` type instead of the C-style > > `T[N]` type. This gives them semantics much more in line with GLSL, > > so they can be initialized and assigned like GLSL arrays. > > > > This allows the ArrayTypes and Assignment tests to pass, so they have > > been added to our dm SkSL tests. (ArrayConstructors also passes, but > > is not ES2-compliant so it is not enabled.) > > > > Change-Id: Id1028311963084befd0e044e11e223af6a064dda > > Bug: skia:10761, skia:10760, skia:11022, skia:10939 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699 > > 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 > > Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:10761 > Bug: skia:10760 > Bug: skia:11022 > Bug: skia:10939 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Bug: skia:10761 Bug: skia:10760 Bug: skia:11022 Bug: skia:10939 Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
#define SKSL_TEST_CPU(name, path) \
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
DEF_TEST(name ## _CPU, r) { \
test_cpu(r, path); \
Reland "Improve support for arrays in Metal." This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b. Reason for revert: updated ArrayTypes test for ES2 compatibility Original change's description: > Revert "Improve support for arrays in Metal." > > This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2. > > Reason for revert: breaks ANGLE > > Original change's description: > > Improve support for arrays in Metal. > > > > Arrays in Metal now use the `array<T, N>` type instead of the C-style > > `T[N]` type. This gives them semantics much more in line with GLSL, > > so they can be initialized and assigned like GLSL arrays. > > > > This allows the ArrayTypes and Assignment tests to pass, so they have > > been added to our dm SkSL tests. (ArrayConstructors also passes, but > > is not ES2-compliant so it is not enabled.) > > > > Change-Id: Id1028311963084befd0e044e11e223af6a064dda > > Bug: skia:10761, skia:10760, skia:11022, skia:10939 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699 > > 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 > > Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:10761 > Bug: skia:10760 > Bug: skia:11022 > Bug: skia:10939 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Bug: skia:10761 Bug: skia:10760 Bug: skia:11022 Bug: skia:10939 Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
}
#define SKSL_TEST_GPU(name, path) \
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(name ## _GPU, r, ctxInfo) { \
test_gpu(r, ctxInfo.directContext(), path); \
}
Loosen ES3 restrictions in Runtime Effects for debugging. This CL adds a RuntimeEffect option flag which skips over the various `strictES2Mode` checks sprinkled throughout IR generation. Runtime Effects still won't allow a lot of ES3 things (the Pipeline stage will reject unsupported statement types, SkVM doesn't support most non-ES2 constructs, etc). However, this change will give us the ability to test many more features involving arrays and structs that previously were off-limits due to ES2 restrictions, and will shore up some legitimate gaps in our testing. This is a useful starting point to allow for improved test coverage. Change-Id: I4a5bc43914e65fc7e59f1cecb76a0ec5a7f05f2f Bug: skia:11209 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402157 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>
2021-04-28 19:14:09 +00:00
#define SKSL_TEST_ES3(name, path) \
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(name ## _GPU, r, ctxInfo) { \
test_es3(r, ctxInfo.directContext(), path); \
}
Reland "Improve support for arrays in Metal." This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b. Reason for revert: updated ArrayTypes test for ES2 compatibility Original change's description: > Revert "Improve support for arrays in Metal." > > This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2. > > Reason for revert: breaks ANGLE > > Original change's description: > > Improve support for arrays in Metal. > > > > Arrays in Metal now use the `array<T, N>` type instead of the C-style > > `T[N]` type. This gives them semantics much more in line with GLSL, > > so they can be initialized and assigned like GLSL arrays. > > > > This allows the ArrayTypes and Assignment tests to pass, so they have > > been added to our dm SkSL tests. (ArrayConstructors also passes, but > > is not ES2-compliant so it is not enabled.) > > > > Change-Id: Id1028311963084befd0e044e11e223af6a064dda > > Bug: skia:10761, skia:10760, skia:11022, skia:10939 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699 > > 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 > > Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:10761 > Bug: skia:10760 > Bug: skia:11022 > Bug: skia:10939 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Bug: skia:10761 Bug: skia:10760 Bug: skia:11022 Bug: skia:10939 Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
#define SKSL_TEST(name, path) SKSL_TEST_CPU(name, path) SKSL_TEST_GPU(name, path)
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
Add SkSL test demonstrating missed optimization with +=. Currently, SkSL is able to constant-propagate `x = x + constant` into `x = constant` when the starting value of x is known. However, it is not able to do the same optimization for `x += constant`. This test demonstrates that once += is encountered, we lose track of x's value and can no longer propagate its value. (This is equally true of all the op-assignment operators, += -= *= /= etc.) Change-Id: I3523e96baf9a73982cf3b09f0d23b95adacf106b Bug: skia:11192 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368248 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-09 15:38:59 +00:00
SKSL_TEST(SkSLAssignmentOps, "folding/AssignmentOps.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLBoolFolding, "folding/BoolFolding.sksl")
Add test demonstrating missed opportunities with casts. A cast like `float(five)` or `int4(colorGreen)` should detect const variables and replace the expression with its compile-time constant equivalent value. At present, this replacement is missed, which inhibits further optimization opportunities on the expression. (This CL is very similar in spirit to http://review.skia.org/404676) Change-Id: I04b5c435a30d2afcdbdb3d020adc15e9c651cc31 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/405682 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-05-07 15:16:26 +00:00
SKSL_TEST(SkSLCastFolding, "folding/CastFolding.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLIntFoldingES2, "folding/IntFoldingES2.sksl")
Loosen ES3 restrictions in Runtime Effects for debugging. This CL adds a RuntimeEffect option flag which skips over the various `strictES2Mode` checks sprinkled throughout IR generation. Runtime Effects still won't allow a lot of ES3 things (the Pipeline stage will reject unsupported statement types, SkVM doesn't support most non-ES2 constructs, etc). However, this change will give us the ability to test many more features involving arrays and structs that previously were off-limits due to ES2 restrictions, and will shore up some legitimate gaps in our testing. This is a useful starting point to allow for improved test coverage. Change-Id: I4a5bc43914e65fc7e59f1cecb76a0ec5a7f05f2f Bug: skia:11209 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402157 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>
2021-04-28 19:14:09 +00:00
SKSL_TEST_ES3(SkSLIntFoldingES3, "folding/IntFoldingES3.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLFloatFolding, "folding/FloatFolding.sksl")
Reland "Add coords parameter to all .sksl test files used as runtime effects" This is a reland of 22dcb5fd7e4ab2a7a1a827165899a54342d2ed53 Original change's description: > Add coords parameter to all .sksl test files used as runtime effects > > Convert to use the newer MakeForShader factory, which requires this. > > Change-Id: Ifaf6054054027c78f3f3fe15596e435e0f79b877 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399336 > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: John Stiles <johnstiles@google.com> Bug: skia:11919 Change-Id: I5f745c54b2bc3712f2281db6e067345903e81931 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/401836 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-04-21 18:27:08 +00:00
// skbug.com/11919: Fails on Nexus5/7, and Intel GPUs
SKSL_TEST_CPU(SkSLMatrixFoldingES2, "folding/MatrixFoldingES2.sksl")
Support structs in runtime effects Uses the pipeline-stage callback mechanism. It mangles the type name (with a test to verify that this works), and then calls defineStruct with the entire SkSL struct definition string. Bug: skia:10939 Change-Id: If14cf1b11faaa80ad8d4086cdacf68532bac43fc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368809 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-10 15:19:27 +00:00
SKSL_TEST(SkSLSelfAssignment, "folding/SelfAssignment.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLShortCircuitBoolFolding, "folding/ShortCircuitBoolFolding.sksl")
Add test demonstrating swizzled constant folding. At present, this is a missed optimization opportunity. These will be optimized in a followup CL. Change-Id: I8882058900cdc12c8ab0df03e36ebfb9d8022f01 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402580 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-04-29 15:14:38 +00:00
SKSL_TEST(SkSLSwizzleFolding, "folding/SwizzleFolding.sksl")
Revert "Disable control-flow analysis in SkSL. (Performance experiment)" This reverts commit 50b1b2b90d609c235c70692ac9b6e6450a7c3fb5. Reason for revert: ending experiment Original change's description: > Disable control-flow analysis in SkSL. (Performance experiment) > > This CL will be used to test for potential performance regressions (or > improvements?) that we might incur by disabling this optimization pass. > > It will be reverted in ~1 day. > > Change-Id: I775cdb0c95df81fa25ebbd66e4ff01f64c660f68 > Bug: skia:11319 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378456 > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: Ie385a82db237ff5651348d82b9651f8ba09375b9 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:11319 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379581 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-04 15:19:48 +00:00
SKSL_TEST(SkSLVectorScalarFolding, "folding/VectorScalarFolding.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLVectorVectorFolding, "folding/VectorVectorFolding.sksl")
Enable additional do-while SkSL tests. These tests were written earlier but not enabled due to the absence of ES3 support in Runtime Effects. Change-Id: Idaf81926271e5b2e483a7c5cfce824a0056f5595 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410460 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-05-20 01:42:57 +00:00
SKSL_TEST_ES3(SkSLDoWhileBodyMustBeInlinedIntoAScope,
"inliner/DoWhileBodyMustBeInlinedIntoAScope.sksl")
SKSL_TEST_ES3(SkSLDoWhileTestCannotBeInlined, "inliner/DoWhileTestCannotBeInlined.sksl")
Run SkSL inliner tests as part of dm. Previously, these tests were never actually executed, only read during code review. They are now properly tested for correctness whenever dm is run. Non-ES2 compliant statements (do/while/switch) are unfortunately excluded here, as they are not compatible with Runtime Effects yet. Change-Id: I965c782baad6f8dd3961a400ae791fb2c1f844d3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389296 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-25 21:04:36 +00:00
SKSL_TEST(SkSLForBodyMustBeInlinedIntoAScope, "inliner/ForBodyMustBeInlinedIntoAScope.sksl")
Loosen ES3 restrictions in Runtime Effects for debugging. This CL adds a RuntimeEffect option flag which skips over the various `strictES2Mode` checks sprinkled throughout IR generation. Runtime Effects still won't allow a lot of ES3 things (the Pipeline stage will reject unsupported statement types, SkVM doesn't support most non-ES2 constructs, etc). However, this change will give us the ability to test many more features involving arrays and structs that previously were off-limits due to ES2 restrictions, and will shore up some legitimate gaps in our testing. This is a useful starting point to allow for improved test coverage. Change-Id: I4a5bc43914e65fc7e59f1cecb76a0ec5a7f05f2f Bug: skia:11209 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402157 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>
2021-04-28 19:14:09 +00:00
SKSL_TEST_ES3(SkSLForInitializerExpressionsCanBeInlined,
"inliner/ForInitializerExpressionsCanBeInlined.sksl")
Run SkSL inliner tests as part of dm. Previously, these tests were never actually executed, only read during code review. They are now properly tested for correctness whenever dm is run. Non-ES2 compliant statements (do/while/switch) are unfortunately excluded here, as they are not compatible with Runtime Effects yet. Change-Id: I965c782baad6f8dd3961a400ae791fb2c1f844d3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389296 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-25 21:04:36 +00:00
SKSL_TEST(SkSLForWithoutReturnInsideCanBeInlined, "inliner/ForWithoutReturnInsideCanBeInlined.sksl")
SKSL_TEST(SkSLForWithReturnInsideCannotBeInlined, "inliner/ForWithReturnInsideCannotBeInlined.sksl")
SKSL_TEST(SkSLIfBodyMustBeInlinedIntoAScope, "inliner/IfBodyMustBeInlinedIntoAScope.sksl")
SKSL_TEST(SkSLIfElseBodyMustBeInlinedIntoAScope, "inliner/IfElseBodyMustBeInlinedIntoAScope.sksl")
SKSL_TEST(SkSLIfElseChainWithReturnsCanBeInlined, "inliner/IfElseChainWithReturnsCanBeInlined.sksl")
SKSL_TEST(SkSLIfTestCanBeInlined, "inliner/IfTestCanBeInlined.sksl")
SKSL_TEST(SkSLIfWithReturnsCanBeInlined, "inliner/IfWithReturnsCanBeInlined.sksl")
SKSL_TEST(SkSLInlineKeywordOverridesThreshold, "inliner/InlineKeywordOverridesThreshold.sksl")
SKSL_TEST(SkSLInlinerAvoidsVariableNameOverlap, "inliner/InlinerAvoidsVariableNameOverlap.sksl")
SKSL_TEST(SkSLInlinerElidesTempVarForReturnsInsideBlock,
"inliner/InlinerElidesTempVarForReturnsInsideBlock.sksl")
SKSL_TEST(SkSLInlinerUsesTempVarForMultipleReturns,
"inliner/InlinerUsesTempVarForMultipleReturns.sksl")
SKSL_TEST(SkSLInlinerUsesTempVarForReturnsInsideBlockWithVar,
"inliner/InlinerUsesTempVarForReturnsInsideBlockWithVar.sksl")
SKSL_TEST(SkSLInlineThreshold, "inliner/InlineThreshold.sksl")
Reland "Add coords parameter to all .sksl test files used as runtime effects" This is a reland of 22dcb5fd7e4ab2a7a1a827165899a54342d2ed53 Original change's description: > Add coords parameter to all .sksl test files used as runtime effects > > Convert to use the newer MakeForShader factory, which requires this. > > Change-Id: Ifaf6054054027c78f3f3fe15596e435e0f79b877 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399336 > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: John Stiles <johnstiles@google.com> Bug: skia:11919 Change-Id: I5f745c54b2bc3712f2281db6e067345903e81931 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/401836 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-04-21 18:27:08 +00:00
// skbug.com/11919: Fails on Adreno + Vulkan
SKSL_TEST_CPU(SkSLInlineWithInoutArgument, "inliner/InlineWithInoutArgument.sksl")
Run SkSL inliner tests as part of dm. Previously, these tests were never actually executed, only read during code review. They are now properly tested for correctness whenever dm is run. Non-ES2 compliant statements (do/while/switch) are unfortunately excluded here, as they are not compatible with Runtime Effects yet. Change-Id: I965c782baad6f8dd3961a400ae791fb2c1f844d3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389296 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-25 21:04:36 +00:00
SKSL_TEST(SkSLInlineWithModifiedArgument, "inliner/InlineWithModifiedArgument.sksl")
SKSL_TEST(SkSLInlineWithNestedBigCalls, "inliner/InlineWithNestedBigCalls.sksl")
SKSL_TEST(SkSLInlineWithUnmodifiedArgument, "inliner/InlineWithUnmodifiedArgument.sksl")
SKSL_TEST(SkSLInlineWithUnnecessaryBlocks, "inliner/InlineWithUnnecessaryBlocks.sksl")
SKSL_TEST(SkSLNoInline, "inliner/NoInline.sksl")
SKSL_TEST(SkSLShortCircuitEvaluationsCannotInlineRightHandSide,
"inliner/ShortCircuitEvaluationsCannotInlineRightHandSide.sksl")
Enable additional SkSL tests which require non-ES2 features. Although these tests are simple, it ended up uncovering a legitimate SPIR-V bug (skia:12009). Change-Id: Ie89235157256b97626aa6ada4d9d6ba62abc57fa Bug: skia:12009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/409299 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-05-17 18:49:05 +00:00
SKSL_TEST_ES3(SkSLStaticSwitchInline, "inliner/StaticSwitch.sksl")
Run SkSL inliner tests as part of dm. Previously, these tests were never actually executed, only read during code review. They are now properly tested for correctness whenever dm is run. Non-ES2 compliant statements (do/while/switch) are unfortunately excluded here, as they are not compatible with Runtime Effects yet. Change-Id: I965c782baad6f8dd3961a400ae791fb2c1f844d3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389296 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-25 21:04:36 +00:00
SKSL_TEST(SkSLStructsCanBeInlinedSafely, "inliner/StructsCanBeInlinedSafely.sksl")
SKSL_TEST(SkSLSwizzleCanBeInlinedDirectly, "inliner/SwizzleCanBeInlinedDirectly.sksl")
SKSL_TEST(SkSLTernaryResultsCannotBeInlined, "inliner/TernaryResultsCannotBeInlined.sksl")
SKSL_TEST(SkSLTernaryTestCanBeInlined, "inliner/TernaryTestCanBeInlined.sksl")
SKSL_TEST(SkSLTrivialArgumentsInlineDirectly, "inliner/TrivialArgumentsInlineDirectly.sksl")
Loosen ES3 restrictions in Runtime Effects for debugging. This CL adds a RuntimeEffect option flag which skips over the various `strictES2Mode` checks sprinkled throughout IR generation. Runtime Effects still won't allow a lot of ES3 things (the Pipeline stage will reject unsupported statement types, SkVM doesn't support most non-ES2 constructs, etc). However, this change will give us the ability to test many more features involving arrays and structs that previously were off-limits due to ES2 restrictions, and will shore up some legitimate gaps in our testing. This is a useful starting point to allow for improved test coverage. Change-Id: I4a5bc43914e65fc7e59f1cecb76a0ec5a7f05f2f Bug: skia:11209 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402157 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>
2021-04-28 19:14:09 +00:00
SKSL_TEST_ES3(SkSLWhileBodyMustBeInlinedIntoAScope,
"inliner/WhileBodyMustBeInlinedIntoAScope.sksl")
SKSL_TEST_ES3(SkSLWhileTestCannotBeInlined, "inliner/WhileTestCannotBeInlined.sksl")
Run SkSL inliner tests as part of dm. Previously, these tests were never actually executed, only read during code review. They are now properly tested for correctness whenever dm is run. Non-ES2 compliant statements (do/while/switch) are unfortunately excluded here, as they are not compatible with Runtime Effects yet. Change-Id: I965c782baad6f8dd3961a400ae791fb2c1f844d3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389296 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-25 21:04:36 +00:00
Disallow inlining a function with out-parameters. It is difficult to do this both efficiently and correctly while honoring GLSL semantics (which require the lvalues to be kept distinct, even when they point to the same variable). We could make it work by making copies of every out parameter in each direction (going in for inouts, and coming out for outs and inouts). However, this could be self-defeating if it makes it harder for the driver to track variable lifetimes. Simply opting out of inlining these functions entirely seems like the best tradeoff; let the driver optimize them if it can, and we can enjoy reduced complexity in the SkSL inliner. Change-Id: I62f7b4550cc181cfe789e4f2ff4e408ba1baf9cb Bug: skia:11326 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/370257 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-17 17:20:10 +00:00
// TODO(skia:11052): SPIR-V does not yet honor `out` param semantics correctly
SKSL_TEST_CPU(SkSLInlinerHonorsGLSLOutParamSemantics,
Run SkSL inliner tests as part of dm. Previously, these tests were never actually executed, only read during code review. They are now properly tested for correctness whenever dm is run. Non-ES2 compliant statements (do/while/switch) are unfortunately excluded here, as they are not compatible with Runtime Effects yet. Change-Id: I965c782baad6f8dd3961a400ae791fb2c1f844d3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389296 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-25 21:04:36 +00:00
"inliner/InlinerHonorsGLSLOutParamSemantics.sksl")
Disallow inlining a function with out-parameters. It is difficult to do this both efficiently and correctly while honoring GLSL semantics (which require the lvalues to be kept distinct, even when they point to the same variable). We could make it work by making copies of every out parameter in each direction (going in for inouts, and coming out for outs and inouts). However, this could be self-defeating if it makes it harder for the driver to track variable lifetimes. Simply opting out of inlining these functions entirely seems like the best tradeoff; let the driver optimize them if it can, and we can enjoy reduced complexity in the SkSL inliner. Change-Id: I62f7b4550cc181cfe789e4f2ff4e408ba1baf9cb Bug: skia:11326 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/370257 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-17 17:20:10 +00:00
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLIntrinsicAbsFloat, "intrinsics/AbsFloat.sksl")
SKSL_TEST(SkSLIntrinsicCeil, "intrinsics/Ceil.sksl")
Disable SkSL test for clamp(). Test is failing on Adreno 6xx + Vulkan. Change-Id: I8e5e97c82622c77385baef2c71d9381203221139 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/412238 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>
2021-05-25 18:53:17 +00:00
// TODO(johnstiles): test broken on Adreno 6xx + Vulkan
//SKSL_TEST(SkSLIntrinsicClampFloat, "intrinsics/ClampFloat.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLIntrinsicMaxFloat, "intrinsics/MaxFloat.sksl")
SKSL_TEST(SkSLIntrinsicMinFloat, "intrinsics/MinFloat.sksl")
Reland "Add coords parameter to all .sksl test files used as runtime effects" This is a reland of 22dcb5fd7e4ab2a7a1a827165899a54342d2ed53 Original change's description: > Add coords parameter to all .sksl test files used as runtime effects > > Convert to use the newer MakeForShader factory, which requires this. > > Change-Id: Ifaf6054054027c78f3f3fe15596e435e0f79b877 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399336 > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: John Stiles <johnstiles@google.com> Bug: skia:11919 Change-Id: I5f745c54b2bc3712f2281db6e067345903e81931 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/401836 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-04-21 18:27:08 +00:00
// skbug.com/11919: Fails on Adreno + Vulkan
SKSL_TEST_CPU(SkSLIntrinsicMixFloat, "intrinsics/MixFloat.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLIntrinsicSignFloat, "intrinsics/SignFloat.sksl")
Implement compile-time optimization for step(). $genType step($genType edge, $genType x); $genType step(float edge, $genType x); $genHType step($genHType edge, $genHType x); $genHType step(half edge, $genHType x); Change-Id: If52634d7a247772e922cb3fd2e3e8a7c36c275f6 Bug: skia:12034 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/411842 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-05-25 15:48:30 +00:00
SKSL_TEST(SkSLIntrinsicStep, "intrinsics/Step.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
Add unit test for array narrowing conversions. Change-Id: Ibadda2a10e19984c7a0efb66fd3187f280666445 Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436996 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-05 14:55:03 +00:00
SKSL_TEST_ES3(SkSLArrayNarrowingConversions, "runtime/ArrayNarrowingConversions.rts")
Reland "Implement operator== and != for Metal structs and arrays." This is a reland of 830c69ca66d339067cdc06775f59443a06fc15a2 Original change's description: > Implement operator== and != for Metal structs and arrays. > > GLSL/SkSL assumes that == and != on struct/array types should work. > We need to emit equality and inequality operators whenever we find code > that compares a struct or array. > > Structs and arrays can be arbitrarily nested, and either type can > contain a matrix. All of these things need custom equality operators in > Metal. Therefore, we need to recursively generate comparison operators > when any of these types are encountered. > > For arrays we get lucky, and we can cover all possible array types and > sizes with a single templated operator== method. Structs and matrices > have no such luck, and are generated separately on a per-type basis. > > For each of these types, operator== is implemented as an equality check > on each field, and operator!= is implemented in terms of operator==. > Equality and inequality are always emitted together. (Previously, matrix > equality and inequality were emitted and implemented independently, but > this is no longer the case.) > > Change-Id: I69ee01c0a390d7db6bcb2253ed6336ab20cc4d1d > Bug: skia:11908, skia:11924 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402016 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11908, skia:11924, skia:11929 Change-Id: I6336b6125e9774c1ca73e3d497e3466f11f6f25f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402559 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-29 18:39:35 +00:00
SKSL_TEST_ES3(SkSLArrayComparison, "shared/ArrayComparison.sksl")
Enable a handful of tests which require ES3. Previously, these tests were commented out because Runtime Effects could not compile ES3. More recently, the `enforceES2Restrictions` option flag was added, which allows these tests to work inside a Runtime Effect. Most of our commented-out tests can be supported this way; enabling them a few at a time will make the inevitable debugging simpler when a driver runs into issues with a test. Change-Id: I1a7a377d392151df4b4789ed5062706717c5a41b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/409280 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>
2021-05-17 13:59:02 +00:00
SKSL_TEST_ES3(SkSLArrayConstructors, "shared/ArrayConstructors.sksl")
Add support for array-cast syntax in SkSL. Compiling a program with "allow narrowing conversions" actually fixes up narrowing casts in the program by inserting casts wherever they would be needed for type-correctness. For instance, compiling the statement `half h = myFloat;` inserts an appropriate narrowing cast: `half h = half(myFloat);`. The Pipeline stage code generator relies on this behavior, as when it re-emits a runtime effect into a complete SkSL program, the narrowing- conversions flag will no longer be set, but that is okay, because the emitted code now contains typecasts anywhere they would be necessary. Logically, this implies that anything which supports narrowing conversions must be castable between high and low precision. In GLSL and SPIR-V, such a cast is trivial, because the types are the same and the precision qualifiers are treated as individual hints on each variable. In Metal, we dodge the issue by only emitting full-precision types. But we also need to emit raw SkSL from an SkSL program (that is what the Pipeline stage generator does). SkSL already supported every typical cast, but GLSL lacked any syntax for casting an array to a different type. This meant SkSL had no array casting syntax as well. SkSL now has array-cast syntax, but it is only allowed for casting low/high-precision arrays to the same base type. (You can't cast an int array to float, or a signed array to unsigned.) Change-Id: Ia20933541c3bd4a946c1ea38209f93008acdb9cb Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437687 Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-10 20:03:44 +00:00
SKSL_TEST_ES3(SkSLArrayCast, "shared/ArrayCast.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLArrayTypes, "shared/ArrayTypes.sksl")
SKSL_TEST(SkSLAssignment, "shared/Assignment.sksl")
SKSL_TEST(SkSLCastsRoundTowardZero, "shared/CastsRoundTowardZero.sksl")
SKSL_TEST(SkSLCommaMixedTypes, "shared/CommaMixedTypes.sksl")
Disable CommaSideEffects test on GPU. This test causes the Adreno 330 driver to crash, and does not pass on Quadro P400 in wasm. The CPU test confirms that we can get it right, even if not all drivers do. Change-Id: I5ffb72ac647a49dab7130ab2c6e94f587ded6cf9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/386216 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>
2021-03-17 20:59:07 +00:00
// This test causes the Adreno 330 driver to crash, and does not pass on Quadro P400 in wasm.
// The CPU test confirms that we can get it right, even if not all drivers do.
SKSL_TEST_CPU(SkSLCommaSideEffects, "shared/CommaSideEffects.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLConstantIf, "shared/ConstantIf.sksl")
Enable proper testing of const arrays. This test was generating invalid code in Metal (http://review.skia.org/408356), but we didn't catch it because the code wasn't actually being run. Change-Id: I649034593a566f9e835b1cf7b0702c64952d31ef Reviewed-on: https://skia-review.googlesource.com/c/skia/+/408641 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-05-14 11:55:45 +00:00
SKSL_TEST_ES3(SkSLConstArray, "shared/ConstArray.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLConstVariableComparison, "shared/ConstVariableComparison.sksl")
SKSL_TEST(SkSLDeadIfStatement, "shared/DeadIfStatement.sksl")
Fix SPIR-V code generation of dead return statements. If we encounter code like `return 1; return 2;` we need to synthesize a label, even though the second return statement isn't actually reachable. This is harmless and satisfies the SPIR-V validator. Ideally we'd eliminate the dead code entirely, but this case is rare and isn't likely to cause any problems as-is. Change-Id: I2d6219dff6868011353e19a662301bec44a015d6 Bug: skia:12009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/409402 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-05-17 18:46:05 +00:00
SKSL_TEST(SkSLDeadReturn, "shared/DeadReturn.sksl")
Reland "Add support for do-while loops in PipelineStage." This is a reland of 9c7e04cd6f372c100e7a46d86a8841dff0d368fa The DeadReturnES3 test isn't enabled yet due to crashes in Radeon, but the PipelineStage fixes need to be landed now. Original change's description: > Add support for do-while loops in PipelineStage. > > This allows us to run tests which use do-while loops (like > DeadReturnES3) within dm. > > Change-Id: If8ecb6b3fcd23d79451a43edf8e1ee8a182de984 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410459 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Change-Id: I73715f09defd950156cc252be9a52a36620d6d5b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410936 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2021-05-20 19:30:22 +00:00
// TODO(skia:12012): some Radeons crash when compiling this code; disable them
//SKSL_TEST_ES3(SkSLDeadReturnES3, "shared/DeadReturnES3.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLDeadStripFunctions, "shared/DeadStripFunctions.sksl")
SKSL_TEST(SkSLDependentInitializers, "shared/DependentInitializers.sksl")
Enable additional do-while SkSL tests. These tests were written earlier but not enabled due to the absence of ES3 support in Runtime Effects. Change-Id: Idaf81926271e5b2e483a7c5cfce824a0056f5595 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410460 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-05-20 01:42:57 +00:00
SKSL_TEST_ES3(SkSLDoWhileControlFlow, "shared/DoWhileControlFlow.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLEmptyBlocksES2, "shared/EmptyBlocksES2.sksl")
SKSL_TEST(SkSLForLoopControlFlow, "shared/ForLoopControlFlow.sksl")
SKSL_TEST(SkSLFunctionArgTypeMatch, "shared/FunctionArgTypeMatch.sksl")
SKSL_TEST(SkSLFunctionReturnTypeMatch, "shared/FunctionReturnTypeMatch.sksl")
SKSL_TEST(SkSLFunctions, "shared/Functions.sksl")
Explicitly detect static recursion in SkSL This relaxes our rules to allow calls to declared (but not yet defined) functions. With that rule change, we have to specifically detect static recursion and produce an error. Bug: skia:12137 Change-Id: I39cc281fcd73fb30014bc7b43043552623727e03 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/431537 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-07-21 19:19:34 +00:00
SKSL_TEST(SkSLFunctionPrototype, "shared/FunctionPrototype.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLGeometricIntrinsics, "shared/GeometricIntrinsics.sksl")
SKSL_TEST(SkSLHelloWorld, "shared/HelloWorld.sksl")
SKSL_TEST(SkSLHex, "shared/Hex.sksl")
SKSL_TEST(SkSLMatrices, "shared/Matrices.sksl")
Re-enable the nonsquare matrix test. The mat4x2 portion of the test no longer checks its results, as there are bugs in the Intel and Radeon GPU drivers that prevent mat4x2s from being constructed properly. The SkSL optimizer ends up eliminating the 4x2 matrix entirely because it is unused by the rest of the code, as well at the 4x4 matrix which is calculated from the 4x2. At this point, I'm OK with this. Change-Id: If1464f9e4938b0a37b2ec180c686972389d94e83 Bug: skia:12003 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/408900 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-05-14 21:53:03 +00:00
SKSL_TEST_ES3(SkSLMatricesNonsquare, "shared/MatricesNonsquare.sksl")
Add SkSL test for matrix equality/inequality operators. Disabled on Adreno 5xx/6xx as the tests do not pass on those GPUs: http://screen/3Dkgs9syj37cjBV Change-Id: Ib935d01e8f06dbfe7decd5cc4e52e0688b48be08 Bug: skia:11306, skia:11308 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368805 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-10 17:21:51 +00:00
SKSL_TEST(SkSLMatrixEquality, "shared/MatrixEquality.sksl")
Enable proper testing of matrix-scalar ops. Now that the various Metal and SPIR-V bugs have been shaken out, we can enable these tests. Knock on wood. Change-Id: If4b4e302cfdd91464aaf00bc9639989de5e49aac Bug: skia:11985 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/408640 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-05-15 00:03:01 +00:00
SKSL_TEST(SkSLMatrixScalarSplat, "shared/MatrixScalarSplat.sksl")
Add support for matrix-to-vector conversions in SkSL. GLSL supports casting vec4 into mat2 and vice versa, so SkSL should have equivalent support. This CL allows the Compound constructor to take a matrix as input, and fixes up backends to do the right thing when a matrix shows up in the compound-constructor path. Change-Id: I13289ad0a27ba59bddc3706093820594efebc693 Bug: skia:12067 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426003 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-07-09 16:41:55 +00:00
SKSL_TEST(SkSLMatrixToVectorCast, "shared/MatrixToVectorCast.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLMultipleAssignments, "shared/MultipleAssignments.sksl")
SKSL_TEST(SkSLNegatedVectorLiteral, "shared/NegatedVectorLiteral.sksl")
SKSL_TEST(SkSLNumberCasts, "shared/NumberCasts.sksl")
SKSL_TEST(SkSLOperatorsES2, "shared/OperatorsES2.sksl")
Enable a handful of tests which require ES3. Previously, these tests were commented out because Runtime Effects could not compile ES3. More recently, the `enforceES2Restrictions` option flag was added, which allows these tests to work inside a Runtime Effect. Most of our commented-out tests can be supported this way; enabling them a few at a time will make the inevitable debugging simpler when a driver runs into issues with a test. Change-Id: I1a7a377d392151df4b4789ed5062706717c5a41b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/409280 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>
2021-05-17 13:59:02 +00:00
SKSL_TEST_ES3(SkSLOperatorsES3, "shared/OperatorsES3.sksl")
Fix fuzzer-discovered error with swizzling matrices. The optimization logic for swizzling a constructor assumed that every argument to the constructor was a scalar or vector. When it was written, this assumption was true. However, we recently added support for casting mat2x2 to float4 which violates the assumption. We now check every argument and do not attempt to optimize if a non-scalar, non-vector arg is found. Change-Id: Ia2b297bd62dfdf4af56712164fbc80c29c9611eb Bug: oss-fuzz:36852 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437017 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-05 15:49:05 +00:00
SKSL_TEST(SkSLOssfuzz36852, "shared/Ossfuzz36852.sksl")
Reland "Add coords parameter to all .sksl test files used as runtime effects" This is a reland of 22dcb5fd7e4ab2a7a1a827165899a54342d2ed53 Original change's description: > Add coords parameter to all .sksl test files used as runtime effects > > Convert to use the newer MakeForShader factory, which requires this. > > Change-Id: Ifaf6054054027c78f3f3fe15596e435e0f79b877 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399336 > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: John Stiles <johnstiles@google.com> Bug: skia:11919 Change-Id: I5f745c54b2bc3712f2281db6e067345903e81931 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/401836 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-04-21 18:27:08 +00:00
// skbug.com/11919: Fails on Adreno + Vulkan
SKSL_TEST_CPU(SkSLOutParams, "shared/OutParams.sksl")
SKSL_TEST_CPU(SkSLOutParamsNoInline, "shared/OutParamsNoInline.sksl")
SKSL_TEST_CPU(SkSLOutParamsTricky, "shared/OutParamsTricky.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLResizeMatrix, "shared/ResizeMatrix.sksl")
Detect functions that fail to return a value, without using CFG. This check now runs at function finalization time, before constant propagation has occurred; this affected the "DeadIfStatement" test. Our detection isn't smart enough to realize that a loop will run zero times, so it treats `for` and `while` loops as always running at least once. This isn't strictly correct, but it actually mirrors how the CFG implementation works anyway. The only downside is that we would not flag code like `for (i=0; i<0; ++i) { return x; }` as an error. Change-Id: I5e43a6ee3a3993045559f0fb0646d36112543a94 Bug: skia:11377 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379056 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 21:00:20 +00:00
SKSL_TEST(SkSLReturnsValueOnEveryPathES2, "shared/ReturnsValueOnEveryPathES2.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLScalarConversionConstructorsES2, "shared/ScalarConversionConstructorsES2.sksl")
Enable additional SkSL tests which require non-ES2 features. Although these tests are simple, it ended up uncovering a legitimate SPIR-V bug (skia:12009). Change-Id: Ie89235157256b97626aa6ada4d9d6ba62abc57fa Bug: skia:12009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/409299 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-05-17 18:49:05 +00:00
SKSL_TEST_ES3(SkSLScalarConversionConstructorsES3, "shared/ScalarConversionConstructorsES3.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLStackingVectorCasts, "shared/StackingVectorCasts.sksl")
SKSL_TEST(SkSLStaticIf, "shared/StaticIf.sksl")
Enable additional SkSL tests which require non-ES2 features. Although these tests are simple, it ended up uncovering a legitimate SPIR-V bug (skia:12009). Change-Id: Ie89235157256b97626aa6ada4d9d6ba62abc57fa Bug: skia:12009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/409299 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-05-17 18:49:05 +00:00
SKSL_TEST_ES3(SkSLStaticSwitch, "shared/StaticSwitch.sksl")
Reland "Implement operator== and != for Metal structs and arrays." This is a reland of 830c69ca66d339067cdc06775f59443a06fc15a2 Original change's description: > Implement operator== and != for Metal structs and arrays. > > GLSL/SkSL assumes that == and != on struct/array types should work. > We need to emit equality and inequality operators whenever we find code > that compares a struct or array. > > Structs and arrays can be arbitrarily nested, and either type can > contain a matrix. All of these things need custom equality operators in > Metal. Therefore, we need to recursively generate comparison operators > when any of these types are encountered. > > For arrays we get lucky, and we can cover all possible array types and > sizes with a single templated operator== method. Structs and matrices > have no such luck, and are generated separately on a per-type basis. > > For each of these types, operator== is implemented as an equality check > on each field, and operator!= is implemented in terms of operator==. > Equality and inequality are always emitted together. (Previously, matrix > equality and inequality were emitted and implemented independently, but > this is no longer the case.) > > Change-Id: I69ee01c0a390d7db6bcb2253ed6336ab20cc4d1d > Bug: skia:11908, skia:11924 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402016 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11908, skia:11924, skia:11929 Change-Id: I6336b6125e9774c1ca73e3d497e3466f11f6f25f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402559 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-29 18:39:35 +00:00
SKSL_TEST(SkSLStructsInFunctions, "shared/StructsInFunctions.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLSwizzleBoolConstants, "shared/SwizzleBoolConstants.sksl")
Migrate some SkSL swizzle tests to dm. Change-Id: I2bd6bf9c368359a2b21861c1b6f621040d335111 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367056 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-05 21:24:03 +00:00
SKSL_TEST(SkSLSwizzleByConstantIndex, "shared/SwizzleByConstantIndex.sksl")
SKSL_TEST(SkSLSwizzleConstants, "shared/SwizzleConstants.sksl")
SKSL_TEST(SkSLSwizzleLTRB, "shared/SwizzleLTRB.sksl")
SKSL_TEST(SkSLSwizzleOpt, "shared/SwizzleOpt.sksl")
SKSL_TEST(SkSLSwizzleScalar, "shared/SwizzleScalar.sksl")
Allow swizzles on Boolean scalar expressions. Boolean vector expressions already allowed swizzles (see the SwizzleBoolConstants.sksl test), but scalars had been inadvertently disallowed. Change-Id: I89e7139db50981f0ee1a9a5086b02603e57f967d Bug: skia:12195 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/427196 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-07-12 19:05:54 +00:00
SKSL_TEST(SkSLSwizzleScalarBool, "shared/SwizzleScalarBool.sksl")
Add scalar-swizzling tests for int and bool types. Boolean scalar-swizzling is currently not working. Change-Id: Icd965e4b64a12311d098168f65622110d5fb3437 Bug: skia:12195 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/427038 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-07-12 18:59:19 +00:00
SKSL_TEST(SkSLSwizzleScalarInt, "shared/SwizzleScalarInt.sksl")
Migrate the last SkSL tests in shared/ to dm. The leftover tests in shared/ are not easily testable as Runtime Effects; they do things that ES2 doesn't support or use a feature not exposed directly by Runtime Effects. Change-Id: I7ebe170cf713c4a0d2dbef333c1fcbac2410c67f Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367059 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-08 19:20:28 +00:00
SKSL_TEST(SkSLTernaryAsLValueEntirelyFoldable, "shared/TernaryAsLValueEntirelyFoldable.sksl")
SKSL_TEST(SkSLTernaryAsLValueFoldableTest, "shared/TernaryAsLValueFoldableTest.sksl")
Optimize ternary tests that check a const variable. This enables the ternary to be optimized away in code like: const bool SHINY = true; color = SHINY ? add_shine(x) : x; // to --> `color = add_shine(x);` Without constant propagation. Also, I added a unit test for ternary expression simplification; I wasn't able to find an existing one. When the optimization flag is disabled, this CL actually removes the optimization of `true ? x : y` --> `x` entirely; previously, this substitution would be made regardless of optimization settings. Change-Id: I93a8b9d4027902d35f8a19cfd6417170b209d056 Bug: skia:11343 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379297 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-03-05 20:22:48 +00:00
SKSL_TEST(SkSLTernaryExpression, "shared/TernaryExpression.sksl")
Migrate the last SkSL tests in shared/ to dm. The leftover tests in shared/ are not easily testable as Runtime Effects; they do things that ES2 doesn't support or use a feature not exposed directly by Runtime Effects. Change-Id: I7ebe170cf713c4a0d2dbef333c1fcbac2410c67f Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367059 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-08 19:20:28 +00:00
SKSL_TEST(SkSLUnaryPositiveNegative, "shared/UnaryPositiveNegative.sksl")
SKSL_TEST(SkSLUnusedVariables, "shared/UnusedVariables.sksl")
SKSL_TEST(SkSLVectorConstructors, "shared/VectorConstructors.sksl")
Reland "Add tests for matrix-vector conversions." This reverts commit f009db5b854b350e9f884fd5268e80271537578b. Reason for revert: test disabled on Win10 + Intel 4400/6100 Original change's description: > Revert "Add tests for matrix-vector conversions." > > This reverts commit a89781215a8182beb0893a004654fef157313259. > > Reason for revert: breakage on Windows > > Original change's description: > > Add tests for matrix-vector conversions. > > > > GLSL supports casting vec4 into mat2 and vice versa, so SkSL should have > > equivalent support. Adding tests as a starting point. > > > > Change-Id: If8bcbf99afcec94d948d5da9e6205cb4a232af18 > > Bug: skia:12067 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/425837 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I2563041f538b1b20074385f1b61af5fc506ffad5 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:12067 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426057 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> Bug: skia:12067 Change-Id: I1379914ee39ce340f09b11b3754820db9c645378 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426058 Reviewed-by: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-07-08 22:20:21 +00:00
SKSL_TEST(SkSLVectorToMatrixCast, "shared/VectorToMatrixCast.sksl")
Reland "Add coords parameter to all .sksl test files used as runtime effects" This is a reland of 22dcb5fd7e4ab2a7a1a827165899a54342d2ed53 Original change's description: > Add coords parameter to all .sksl test files used as runtime effects > > Convert to use the newer MakeForShader factory, which requires this. > > Change-Id: Ifaf6054054027c78f3f3fe15596e435e0f79b877 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399336 > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: John Stiles <johnstiles@google.com> Bug: skia:11919 Change-Id: I5f745c54b2bc3712f2281db6e067345903e81931 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/401836 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-04-21 18:27:08 +00:00
// skbug.com/11919: Fails on Nexus5/7, and Intel GPUs
SKSL_TEST_CPU(SkSLVectorScalarMath, "shared/VectorScalarMath.sksl")
Enable a handful of tests which require ES3. Previously, these tests were commented out because Runtime Effects could not compile ES3. More recently, the `enforceES2Restrictions` option flag was added, which allows these tests to work inside a Runtime Effect. Most of our commented-out tests can be supported this way; enabling them a few at a time will make the inevitable debugging simpler when a driver runs into issues with a test. Change-Id: I1a7a377d392151df4b4789ed5062706717c5a41b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/409280 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>
2021-05-17 13:59:02 +00:00
SKSL_TEST_ES3(SkSLWhileLoopControlFlow, "shared/WhileLoopControlFlow.sksl")
Reland "Add SkSL for-loop control flow test to dm." This reverts commit 578f1acbe8a47178efb21df49561c365226f9d95. Reason for revert: updated test to pass on Mac Intel 5100/6000 Original change's description: > Revert "Add SkSL for-loop control flow test to dm." > > This reverts commit a0c266283a8ef230ad0436dbf885d2b616e7302b. > > Reason for revert: failing on Mac Intel > > Original change's description: > > Add SkSL for-loop control flow test to dm. > > > > While loops and do-while loops remain untested in dm, as they are not > > supported in ES2 (and therefore not available in Runtime Effects). > > > > Change-Id: I2f1bfccccd571cc4ced096bc18ebbb9ecc9f9b4a > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359556 > > Commit-Queue: John Stiles <johnstiles@google.com> > > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I45335d16a695644eaeb8a535298c0efcc616c1ce > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359840 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I2dc6e870393708a12286658001b723f25a6aec4a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359856 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-27 14:56:04 +00:00
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
/*
TODO(skia:11209): enable these tests when Runtime Effects have support for ES3
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLMatrixFoldingES3, "folding/MatrixFoldingES3.sksl")
SKSL_TEST(SkSLIntrinsicAbsInt, "intrinsics/AbsInt.sksl")
SKSL_TEST(SkSLIntrinsicClampInt, "intrinsics/ClampInt.sksl")
SKSL_TEST(SkSLIntrinsicMaxInt, "intrinsics/MaxInt.sksl")
SKSL_TEST(SkSLIntrinsicMinInt, "intrinsics/MinInt.sksl")
SKSL_TEST(SkSLIntrinsicMixBool, "intrinsics/MixBool.sksl")
SKSL_TEST(SkSLIntrinsicSignInt, "intrinsics/SignInt.sksl")
SKSL_TEST(SkSLDeadLoopVariable, "shared/DeadLoopVariable.sksl")
SKSL_TEST(SkSLEmptyBlocksES3, "shared/EmptyBlocksES3.sksl")
SKSL_TEST(SkSLHexUnsigned, "shared/HexUnsigned.sksl")
SKSL_TEST(SkSLResizeMatrixNonsquare, "shared/ResizeMatrixNonsquare.sksl")
Detect functions that fail to return a value, without using CFG. This check now runs at function finalization time, before constant propagation has occurred; this affected the "DeadIfStatement" test. Our detection isn't smart enough to realize that a loop will run zero times, so it treats `for` and `while` loops as always running at least once. This isn't strictly correct, but it actually mirrors how the CFG implementation works anyway. The only downside is that we would not flag code like `for (i=0; i<0; ++i) { return x; }` as an error. Change-Id: I5e43a6ee3a3993045559f0fb0646d36112543a94 Bug: skia:11377 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379056 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 21:00:20 +00:00
SKSL_TEST(SkSLReturnsValueOnEveryPathES3, "shared/ReturnsValueOnEveryPathES3.sksl")
Migrate some SkSL swizzle tests to dm. Change-Id: I2bd6bf9c368359a2b21861c1b6f621040d335111 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367056 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-05 21:24:03 +00:00
SKSL_TEST(SkSLSwizzleByIndex, "shared/SwizzleByIndex.sksl")
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
*/
Reference in New Issue Copy Permalink