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

494 lines
27 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
Re-land "Added tests for sksl clone() on our test corpus". This reverts commit 63a4d65e161a6323159a61b78829a431c37b7e19. Change-Id: Ibd17331d518cf1ac95a310e505ee5b0f6495905e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501318 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-03 19:51:02 +00:00
#include "include/sksl/DSLCore.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 "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"
Re-land "Added SkSL dehydrate / rehydrate test" This reverts commit 07d229c7952dc194822c704228185d260aa96474. Change-Id: I403020f05f2ca17b94b35dcaa6cc35514f7a0cdf Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502313 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-01 15:23:17 +00:00
#include "src/sksl/SkSLCompiler.h"
#include "src/sksl/SkSLDehydrator.h"
#include "src/sksl/SkSLRehydrator.h"
Re-land "Added tests for sksl clone() on our test corpus". This reverts commit 63a4d65e161a6323159a61b78829a431c37b7e19. Change-Id: Ibd17331d518cf1ac95a310e505ee5b0f6495905e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501318 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-03 19:51:02 +00:00
#include "src/sksl/SkSLThreadContext.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"
Update SkSLTest to check a 2x2 surface. Derivative tests don't really make intuitive sense in a 1x1 surface. This should give the derivatives a better workout. Change-Id: I09e5ff2b7815d42d1874e5deef360e9bc2e83aff Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449195 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-09-15 21:42:42 +00:00
static constexpr int kWidth = 2;
static constexpr int kHeight = 2;
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 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;
}
}
Add SkSL test for uniform arrays. These weren't used anywhere in our test suite. Change-Id: I35e8607ad2dbddf8f403668bd2b2636a8964d304 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455777 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-10-04 21:02:16 +00:00
template <typename T>
static void set_uniform_array(SkRuntimeShaderBuilder* builder, const char* name, SkSpan<T> values) {
SkRuntimeShaderBuilder::BuilderUniform uniform = builder->uniform(name);
if (uniform.fVar) {
uniform.set(values.data(), values.size());
}
}
Re-land "Added SkSL dehydrate / rehydrate test" This reverts commit 07d229c7952dc194822c704228185d260aa96474. Change-Id: I403020f05f2ca17b94b35dcaa6cc35514f7a0cdf Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502313 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-01 15:23:17 +00:00
static SkString load_source(skiatest::Reporter* r,
const char* testFile,
const char* permutationSuffix) {
SkString resourcePath = SkStringPrintf("sksl/%s", testFile);
sk_sp<SkData> shaderData = GetResourceAsData(resourcePath.c_str());
if (!shaderData) {
Re-land "Added tests for sksl clone() on our test corpus". This reverts commit 63a4d65e161a6323159a61b78829a431c37b7e19. Change-Id: Ibd17331d518cf1ac95a310e505ee5b0f6495905e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501318 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-03 19:51:02 +00:00
ERRORF(r, "%s%s: Unable to load file", testFile, permutationSuffix);
Re-land "Added SkSL dehydrate / rehydrate test" This reverts commit 07d229c7952dc194822c704228185d260aa96474. Change-Id: I403020f05f2ca17b94b35dcaa6cc35514f7a0cdf Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502313 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-01 15:23:17 +00:00
return SkString("");
}
return SkString{reinterpret_cast<const char*>(shaderData->bytes()), shaderData->size()};
}
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) {
Re-land "Added SkSL dehydrate / rehydrate test" This reverts commit 07d229c7952dc194822c704228185d260aa96474. Change-Id: I403020f05f2ca17b94b35dcaa6cc35514f7a0cdf Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502313 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-01 15:23:17 +00:00
SkString shaderString = load_source(r, testFile, permutationSuffix);
if (shaderString.isEmpty()) {
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;
}
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;
}
Add SkSL test for uniform arrays. These weren't used anywhere in our test suite. Change-Id: I35e8607ad2dbddf8f403668bd2b2636a8964d304 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455777 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-10-04 21:02:16 +00:00
static constexpr float kArray[5] = {1, 2, 3, 4, 5};
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 SkSL test for uniform arrays. These weren't used anywhere in our test suite. Change-Id: I35e8607ad2dbddf8f403668bd2b2636a8964d304 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455777 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-10-04 21:02:16 +00:00
set_uniform_array(&builder, "testArray", SkMakeSpan(kArray));
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
Remove default/deprecated arguments to makeShader calls Bug: skia:12643 Change-Id: I37e1718a20283dfb814c85260257d57bac2b7b34 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/506211 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: Brian Osman <brianosman@google.com>
2022-02-09 16:56:45 +00:00
sk_sp<SkShader> shader = builder.makeShader();
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
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);
Update SkSLTest to check a 2x2 surface. Derivative tests don't really make intuitive sense in a 1x1 surface. This should give the derivatives a better workout. Change-Id: I09e5ff2b7815d42d1874e5deef360e9bc2e83aff Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449195 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-09-15 21:42:42 +00:00
surface->getCanvas()->drawRect(SkRect::MakeWH(kWidth, kHeight), paintShader);
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
SkBitmap bitmap;
REPORTER_ASSERT(r, bitmap.tryAllocPixels(surface->imageInfo()));
REPORTER_ASSERT(r, surface->readPixels(bitmap.info(), bitmap.getPixels(), bitmap.rowBytes(),
/*srcX=*/0, /*srcY=*/0));
Update SkSLTest to check a 2x2 surface. Derivative tests don't really make intuitive sense in a 1x1 surface. This should give the derivatives a better workout. Change-Id: I09e5ff2b7815d42d1874e5deef360e9bc2e83aff Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449195 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-09-15 21:42:42 +00:00
bool success = true;
SkColor color[kHeight][kWidth];
for (int y = 0; y < kHeight; ++y) {
for (int x = 0; x < kWidth; ++x) {
color[y][x] = bitmap.getColor(x, y);
if (color[y][x] != SkColorSetARGB(0xFF, 0x00, 0xFF, 0x00)) {
success = false;
}
}
}
if (!success) {
static_assert(kWidth == 2);
static_assert(kHeight == 2);
ERRORF(r, "Expected: solid green. Actual:\n"
"RRGGBBAA RRGGBBAA\n"
"%02X%02X%02X%02X %02X%02X%02X%02X\n"
"%02X%02X%02X%02X %02X%02X%02X%02X",
SkColorGetR(color[0][0]), SkColorGetG(color[0][0]),
SkColorGetB(color[0][0]), SkColorGetA(color[0][0]),
SkColorGetR(color[0][1]), SkColorGetG(color[0][1]),
SkColorGetB(color[0][1]), SkColorGetA(color[0][1]),
SkColorGetR(color[1][0]), SkColorGetG(color[1][0]),
SkColorGetB(color[1][0]), SkColorGetA(color[1][0]),
SkColorGetR(color[1][1]), SkColorGetG(color[1][1]),
SkColorGetB(color[1][1]), SkColorGetA(color[1][1]));
}
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
}
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,
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
bool strictES2) {
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 =
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
strictES2 ? 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
}
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
static void test_cpu(skiatest::Reporter* r, const char* testFile, bool strictES2) {
Update SkSLTest to check a 2x2 surface. Derivative tests don't really make intuitive sense in a 1x1 surface. This should give the derivatives a better workout. Change-Id: I09e5ff2b7815d42d1874e5deef360e9bc2e83aff Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449195 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-09-15 21:42:42 +00:00
const SkImageInfo info = SkImageInfo::MakeN32Premul(kWidth, kHeight);
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<SkSurface> surface(SkSurface::MakeRaster(info));
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
test_permutations(r, surface.get(), testFile, strictES2);
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) {
Update SkSLTest to check a 2x2 surface. Derivative tests don't really make intuitive sense in a 1x1 surface. This should give the derivatives a better workout. Change-Id: I09e5ff2b7815d42d1874e5deef360e9bc2e83aff Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449195 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-09-15 21:42:42 +00:00
const SkImageInfo info = SkImageInfo::MakeN32Premul(kWidth, kHeight);
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<SkSurface> surface(SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info));
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
test_permutations(r, surface.get(), testFile, /*strictES2=*/true);
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_es3(skiatest::Reporter* r, GrDirectContext* ctx, const char* testFile) {
Check for SkSL ES3 capabilities in GrShaderCaps. This lets us set the minimum bar for SkSL ES3 support in one place, rather than checking this set of bits in multiple spots. Change-Id: Icba58d8b6a93626ce2ffbe3c4b846cad4749cab5 Bug: skia:12347 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/440518 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-08-18 16:17:21 +00:00
if (!ctx->priv().caps()->shaderCaps()->supportsSkSLES3()) {
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.
Update SkSLTest to check a 2x2 surface. Derivative tests don't really make intuitive sense in a 1x1 surface. This should give the derivatives a better workout. Change-Id: I09e5ff2b7815d42d1874e5deef360e9bc2e83aff Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449195 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-09-15 21:42:42 +00:00
const SkImageInfo info = SkImageInfo::MakeN32Premul(kWidth, kHeight);
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
sk_sp<SkSurface> surface(SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info));
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
test_permutations(r, surface.get(), testFile, /*strictES2=*/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
}
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
static void test_clone(skiatest::Reporter* r, const char* testFile, bool strictES2) {
Re-land "Added tests for sksl clone() on our test corpus". This reverts commit 63a4d65e161a6323159a61b78829a431c37b7e19. Change-Id: Ibd17331d518cf1ac95a310e505ee5b0f6495905e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501318 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-03 19:51:02 +00:00
SkString shaderString = load_source(r, testFile, "");
if (shaderString.isEmpty()) {
return;
}
std::unique_ptr<SkSL::ShaderCaps> caps = SkSL::ShaderCapsFactory::Standalone();
SkSL::Program::Settings settings;
settings.fAllowVarDeclarationCloneForTesting = true;
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
settings.fEnforceES2Restrictions = strictES2;
Re-land "Added tests for sksl clone() on our test corpus". This reverts commit 63a4d65e161a6323159a61b78829a431c37b7e19. Change-Id: Ibd17331d518cf1ac95a310e505ee5b0f6495905e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501318 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-03 19:51:02 +00:00
SkSL::Compiler compiler(caps.get());
std::unique_ptr<SkSL::Program> program = compiler.convertProgram(
SkSL::ProgramKind::kRuntimeShader, shaderString.c_str(), settings);
if (!program) {
ERRORF(r, "%s", compiler.errorText().c_str());
return;
}
// Starting DSL allows us to get access to the ThreadContext::Settings
SkSL::dsl::Start(&compiler, SkSL::ProgramKind::kFragment, settings);
for (const std::unique_ptr<SkSL::ProgramElement>& element : program->fOwnedElements) {
std::string original = element->description();
std::string cloned = element->clone()->description();
REPORTER_ASSERT(r, original == cloned,
"Mismatch after clone!\nOriginal: %s\nCloned: %s\n", original.c_str(),
cloned.c_str());
}
SkSL::dsl::End();
}
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
static void test_rehydrate(skiatest::Reporter* r, const char* testFile, bool strictES2) {
Re-land "Added SkSL dehydrate / rehydrate test" This reverts commit 07d229c7952dc194822c704228185d260aa96474. Change-Id: I403020f05f2ca17b94b35dcaa6cc35514f7a0cdf Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502313 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-01 15:23:17 +00:00
SkString shaderString = load_source(r, testFile, "");
if (shaderString.isEmpty()) {
return;
}
std::unique_ptr<SkSL::ShaderCaps> caps = SkSL::ShaderCapsFactory::Default();
SkSL::Compiler compiler(caps.get());
SkSL::Program::Settings settings;
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
settings.fEnforceES2Restrictions = strictES2;
Re-land "Added SkSL dehydrate / rehydrate test" This reverts commit 07d229c7952dc194822c704228185d260aa96474. Change-Id: I403020f05f2ca17b94b35dcaa6cc35514f7a0cdf Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502313 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-01 15:23:17 +00:00
// Inlining causes problems because it can create expressions like bool(1) that can't be
// directly instantiated. After a dehydrate/recycle pass, that expression simply becomes "true"
// due to optimization - which is fine, but would cause us to fail an equality comparison. We
// disable inlining to avoid this issue.
settings.fInlineThreshold = 0;
std::unique_ptr<SkSL::Program> program = compiler.convertProgram(
SkSL::ProgramKind::kRuntimeShader, shaderString.c_str(), settings);
if (!program) {
ERRORF(r, "%s", compiler.errorText().c_str());
return;
}
SkSL::Dehydrator dehydrator;
Improved whole-program dehydration and rehydration This adds a Dehydrator.write(Program) to mirror the Rehydrator's program() method and simplifies the API. Change-Id: I1b6d6b722d0ce8e6a292132522f806e43d49ce85 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502704 Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-03 21:03:17 +00:00
dehydrator.write(*program);
Re-land "Added SkSL dehydrate / rehydrate test" This reverts commit 07d229c7952dc194822c704228185d260aa96474. Change-Id: I403020f05f2ca17b94b35dcaa6cc35514f7a0cdf Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502313 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-01 15:23:17 +00:00
SkSL::StringStream stream;
dehydrator.finish(stream);
SkSL::Rehydrator rehydrator(compiler, (const uint8_t*) stream.str().data(),
stream.str().length());
Improved symbol handling in whole-program serialization Previously, a dehydrated SkSL program would include all symbols, even module builtins. The rehydration API also required a vector of shared elements, which made the API essentially impossible to use outside of the very artificial situation in our test cases, where we retained the original program so we could simply grab the elements from it. We obviously cannot rely on the original program still being around in order to successfully rehydrate it. This CL eliminates the parent symbol tables, referring to module builtins by name instead. This reduces the size of a small dehydrated program by roughly 95%. We also encode the shared elements directly into the output, which both simplifies the API and makes it work in real-world cases. Change-Id: I8e5dddf9316fe0886e6b97e7d29638fff8f9f499 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505816 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-08 18:11:42 +00:00
std::unique_ptr<SkSL::Program> rehydrated = rehydrator.program();
Re-land "Added SkSL dehydrate / rehydrate test" This reverts commit 07d229c7952dc194822c704228185d260aa96474. Change-Id: I403020f05f2ca17b94b35dcaa6cc35514f7a0cdf Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502313 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-01 15:23:17 +00:00
REPORTER_ASSERT(r, rehydrated->description() == program->description(),
"Mismatch between original and dehydrated/rehydrated:\n-- Original:\n%s\n"
"-- Rehydrated:\n%s", program->description().c_str(),
rehydrated->description().c_str());
}
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
// Helper macros for various test environment invocations. Do not use these to declare test cases.
// Use one of the SKSL_TEST_* macros below instead.
#define DECL_TEST_CPU(name, path) \
DEF_TEST(name##_CPU, r) { test_cpu(r, path, /*strictES2=*/true); }
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
#define DECL_TEST_CPU_NO_STRICT_ES2(name, path) \
DEF_TEST(name##_CPU_NO_STRICT_ES2, r) { test_cpu(r, path, /*strictES2=*/false); }
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
#define DECL_TEST_GPU(name, path) \
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(name##_GPU, r, ctxInfo) { \
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
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
}
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
#define DECL_TEST_GPU_ES3(name, path) \
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(name##_GPU_ES3, r, ctxInfo) { \
test_es3(r, ctxInfo.directContext(), path); \
Re-land "Added SkSL dehydrate / rehydrate test" This reverts commit 07d229c7952dc194822c704228185d260aa96474. Change-Id: I403020f05f2ca17b94b35dcaa6cc35514f7a0cdf Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502313 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-01 15:23:17 +00:00
}
Fixing comparison for structs and arrays Recursive comparison with tests Bug: skia:12642 Change-Id: I344812a26f9af7b8a904c6faf6319df86ce57d03 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/472997 Commit-Queue: Julia Lavrova <jlavrova@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-11-17 20:48:18 +00:00
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
#define DECL_TEST_CLONE(name, path, strictES2) \
DEF_TEST(name##_CLONE, r) { test_clone(r, path, strictES2); }
#define DECL_TEST_REHYDRATE(name, path, strictES2) \
DEF_TEST(name##_REHYDRATE, r) { test_rehydrate(r, path, strictES2); }
// Use the following macros when declaring test cases:
#define SKSL_TEST_CPU(name, path) \
DECL_TEST_CPU(name, path) \
DECL_TEST_CLONE(name, path, /*strictES2=*/true) \
DECL_TEST_REHYDRATE(name, path, /*strictES2=*/true)
// Tests that only use the CPU backend but without "strict ES2 mode", which limits SkSL language
// features to GLSL ES 1.0. The CPU backend lacks support for many ES3 features. This is
// appropriate for tests that use a subset of ES3 that is supported.
#define SKSL_TEST_CPU_NO_STRICT_ES2(name, path) \
DECL_TEST_CPU_NO_STRICT_ES2(name, path) \
DECL_TEST_CLONE(name, path, /*strictES2=*/false) \
DECL_TEST_REHYDRATE(name, path, /*strictES2=*/false)
// Tests that run on GPUs with ES3 support only.
#define SKSL_TEST_GPU_ES3(name, path) \
DECL_TEST_GPU_ES3(name, path) \
DECL_TEST_CLONE(name, path, /*strictES2=*/false) \
DECL_TEST_REHYDRATE(name, path, /*strictES2=*/false)
Re-land "Added tests for sksl clone() on our test corpus". This reverts commit 63a4d65e161a6323159a61b78829a431c37b7e19. Change-Id: Ibd17331d518cf1ac95a310e505ee5b0f6495905e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501318 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-03 19:51:02 +00:00
[sksl][tests] Enable CLONE and REHYDRATE tests for GPU/ES3 cases These tests were not being run for ES3-only GPU and non-strict-ES2 CPU tests. CLONE and REHYDRATE variants are now generated for all test declarations. Change-Id: I8ce14bd50f175d0bae66d9593b68a42fab701f93 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513056 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-25 22:42:29 +00:00
#define SKSL_TEST(name, path) \
DECL_TEST_CPU(name, path) \
DECL_TEST_GPU(name, path) \
DECL_TEST_CLONE(name, path, /*strictES2=*/true) \
DECL_TEST_REHYDRATE(name, path, /*strictES2=*/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
Allow non-trivial constant expressions for array sizes. This fixes GLSL ES2 conformance test `array`. Change-Id: I6ebee9253e1e8c394d9ddb6899e3a0940b7a38ef Bug: skia:12495 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/458718 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-10-12 20:53:24 +00:00
SKSL_TEST(SkSLArraySizeFolding, "folding/ArraySizeFolding.sksl")
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")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_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")
Update MatrixFoldingES2 test to run on GPU. This shook out a few driver issues. Change-Id: If12f11c4b3b562fec402bddce25edf01a8be83b9 Bug: skia:12858, skia:11919 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/500816 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-01-27 14:33:58 +00:00
SKSL_TEST(SkSLMatrixFoldingES2, "folding/MatrixFoldingES2.sksl")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(SkSLMatrixFoldingES3, "folding/MatrixFoldingES3.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 for switch-case folding. Change-Id: I3dabd77890a73ea054bb57d466a6ed8273eae3e8 Bug: skia:12811 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/494196 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-01-12 21:36:02 +00:00
SKSL_TEST(SkSLSwitchCaseFolding, "folding/SwitchCaseFolding.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")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(SkSLDoWhileBodyMustBeInlinedIntoAScope,
"inliner/DoWhileBodyMustBeInlinedIntoAScope.sksl")
SKSL_TEST_GPU_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")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_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")
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")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_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")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(SkSLWhileBodyMustBeInlinedIntoAScope,
"inliner/WhileBodyMustBeInlinedIntoAScope.sksl")
SKSL_TEST_GPU_ES3(SkSLWhileTestCannotBeInlined, "inliner/WhileTestCannotBeInlined.sksl")
SKSL_TEST(SkSLIntrinsicAbsFloat, "intrinsics/AbsFloat.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicAbsInt, "intrinsics/AbsInt.sksl")
SKSL_TEST(SkSLIntrinsicCeil, "intrinsics/Ceil.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicDeterminant, "intrinsics/Determinant.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicDFdx, "intrinsics/DFdx.sksl")
Fixed SkSL dFdy rehydrate test dFdy wasn't working due to the DSL never having been started. Bug: skia:12985 Change-Id: Ic58018e3dec3e9df15c2e784f8732ee99e793353 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513938 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-03-01 15:11:23 +00:00
SKSL_TEST_GPU_ES3(SkSLIntrinsicDFdy, "intrinsics/DFdy.sksl")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(SkSLIntrinsicFloatBitsToInt, "intrinsics/FloatBitsToInt.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicFloatBitsToUint, "intrinsics/FloatBitsToUint.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicFwidth, "intrinsics/Fwidth.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicIntBitsToFloat, "intrinsics/IntBitsToFloat.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicIsInf, "intrinsics/IsInf.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicClampInt, "intrinsics/ClampInt.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicClampUInt, "intrinsics/ClampUInt.sksl")
SKSL_TEST(SkSLIntrinsicClampFloat, "intrinsics/ClampFloat.sksl")
SKSL_TEST(SkSLIntrinsicMatrixCompMultES2, "intrinsics/MatrixCompMultES2.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicMatrixCompMultES3, "intrinsics/MatrixCompMultES3.sksl")
SKSL_TEST(SkSLIntrinsicMaxFloat, "intrinsics/MaxFloat.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicMaxInt, "intrinsics/MaxInt.sksl")
SKSL_TEST(SkSLIntrinsicMinFloat, "intrinsics/MinFloat.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicMinInt, "intrinsics/MinInt.sksl")
SKSL_TEST(SkSLIntrinsicMixFloat, "intrinsics/MixFloat.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicModf, "intrinsics/Modf.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicOuterProduct, "intrinsics/OuterProduct.sksl")
Disable SkSLIntrinsicPackUnorm2x16 test. This test fails on my work laptop (Radeon 5300M) so simply disabling it on the tree isn't sufficient in this case. We don't seem to have a test opt-out mechanism that automatically applies to local runs of dm. Change-Id: I83582f0cdc3c9e6a61e6dc8e07851b9705143423 Bug: skia:12434 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/447057 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-09-09 13:59:14 +00:00
// Fails on Mac OpenGL + Radeon 5300M (skia:12434)
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
// SKSL_TEST_GPU_ES3(SkSLIntrinsicPackUnorm2x16, "intrinsics/PackUnorm2x16.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicRound, "intrinsics/Round.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicRoundEven, "intrinsics/RoundEven.sksl")
SKSL_TEST(SkSLIntrinsicSignFloat, "intrinsics/SignFloat.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicSignInt, "intrinsics/SignInt.sksl")
SKSL_TEST(SkSLIntrinsicStep, "intrinsics/Step.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicTrunc, "intrinsics/Trunc.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicTranspose, "intrinsics/Transpose.sksl")
SKSL_TEST_GPU_ES3(SkSLIntrinsicUintBitsToFloat, "intrinsics/UintBitsToFloat.sksl")
SKSL_TEST_GPU_ES3(SkSLArrayNarrowingConversions, "runtime/ArrayNarrowingConversions.rts")
SKSL_TEST(SkSLLoopFloat, "runtime/LoopFloat.rts")
SKSL_TEST(SkSLLoopInt, "runtime/LoopInt.rts")
SKSL_TEST(SkSLQualifierOrder, "runtime/QualifierOrder.rts")
SKSL_TEST(SkSLPrecisionQualifiers, "runtime/PrecisionQualifiers.rts")
// These tests specifically rely on SkVM backend behavior that is difficult to enforce on Metal and
// GLSL implementations and specifically differs from Vulkan behavior (skia:12977). They also
// rely on equality operators on array types which are not available in GLSL ES 1.00. Therefore
// these tests are restricted to run on CPU and with "strict ES2 mode" disabled.
SKSL_TEST_CPU_NO_STRICT_ES2(SkSLRecursiveComparison_Arrays,
"runtime/RecursiveComparison_Arrays.rts")
SKSL_TEST_CPU_NO_STRICT_ES2(SkSLRecursiveComparison_Structs,
"runtime/RecursiveComparison_Structs.rts")
SKSL_TEST_CPU_NO_STRICT_ES2(SkSLRecursiveComparison_Types, "runtime/RecursiveComparison_Types.rts")
SKSL_TEST_CPU_NO_STRICT_ES2(SkSLRecursiveComparison_Vectors,
"runtime/RecursiveComparison_Vectors.rts")
SKSL_TEST_GPU_ES3(SkSLArrayComparison, "shared/ArrayComparison.sksl")
SKSL_TEST_GPU_ES3(SkSLArrayConstructors, "shared/ArrayConstructors.sksl")
SKSL_TEST_GPU_ES3(SkSLArrayCast, "shared/ArrayCast.sksl")
SKSL_TEST_GPU_ES3(SkSLArrayFollowedByScalar, "shared/ArrayFollowedByScalar.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")
Update CommaSideEffects test to run on GPU. Change-Id: Ia218fb2249abd479db9d27527b965fd0b8ad3367 Bug: skia:12858 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501276 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2022-01-31 20:57:01 +00:00
SKSL_TEST(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")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_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][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(SkSLDeadLoopVariable, "shared/DeadLoopVariable.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(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][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
// SKSL_TEST_GPU_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")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_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][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(SkSLEmptyBlocksES3, "shared/EmptyBlocksES3.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(SkSLForLoopControlFlow, "shared/ForLoopControlFlow.sksl")
Add support for anonymous function parameters in SkSL. Anonymous function parameters are now automatically assigned a name, "_skAnonymousParamN", where N is the parameter index. Change-Id: I87adcd51ed025c76ae2b333317f21b523a4632b4 Bug: skia:12769 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/489538 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-12-28 19:36:34 +00:00
SKSL_TEST(SkSLFunctionAnonymousParameters, "shared/FunctionAnonymousParameters.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(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][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(SkSLHexUnsigned, "shared/HexUnsigned.sksl")
Fix up test SkSLInlineWithInoutArgument. The test has been moved to shared/, since it's a valid test, but it is no longer related to inlining, as the inliner no longer attempts to inline functions with inouts at all. Also, one function here (outParameterIgnore) actually invoked undefined behavior and has been removed. According to the GLSL ES2 docs: "If a function does not write to an out parameter, the value of the actual parameter is undefined when the function returns." SkVM leaves the value unchanged, so SKSL_TEST_CPU would pass, but a GPU might clear it (and in fact, my GPU does). Change-Id: I77c77ed1354bc980344ec5c406992bd62015f5e5 Bug: skia:11919 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/499752 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2022-01-25 20:54:24 +00:00
SKSL_TEST(SkSLInoutParameters, "shared/InoutParameters.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(SkSLMatrices, "shared/Matrices.sksl")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(SkSLMatricesNonsquare, "shared/MatricesNonsquare.sksl")
Disable matrix constructor tests Given how badly these fail (even on recent NVIDIA drivers), I'm prepared to ignore the conformance suite on this one and just disallow this in SkSL. For now, this disables these tests so that they don't crash for anyone running an NV GPU. Bug: skia:12443 Change-Id: I990eaa47acf0e23f4f0b6e90e136712d837b7f6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/477477 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-11-29 22:12:06 +00:00
// TODO(skia:12443) These tests actually don't work on MANY devices. The GLSL conformance suite
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
// does a terrible job of enforcing this rule. We still test them on CPU.
SKSL_TEST_CPU(SkSLMatrixConstructorsES2, "shared/MatrixConstructorsES2.sksl")
SKSL_TEST_CPU_NO_STRICT_ES2(SkSLMatrixConstructorsES3, "shared/MatrixConstructorsES3.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")
Reland "Better Matrix/Scalar testing" This reverts commit 455e580b9c786b923fd4af54fdc84e2b289c1581. Reason for revert: Fixing the build break Original change's description: > Revert "Better Matrix/Scalar testing" > > This reverts commit abb611550eb8e8b82949895395a5a6c3e06ae7ab. > > Reason for revert: Build break > Original change's description: > > Better Matrix/Scalar testing > > > > Adding tests for matrix math and comparison > > bug: skia:12681 > > > > Change-Id: Ia1537ee2e411383749456fd6ff938b7c9a2e1061 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/493416 > > Reviewed-by: John Stiles <johnstiles@google.com> > > Commit-Queue: Julia Lavrova <jlavrova@google.com> > > Change-Id: I70871b4b75c1f10e870dc5e884a42405a80fc0f9 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/494816 > Reviewed-by: John Stiles <johnstiles@google.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Julia Lavrova <jlavrova@google.com> Change-Id: Idef8dbcd6f5a5bbe84d3fd86888e3eab0f0521ee Reviewed-on: https://skia-review.googlesource.com/c/skia/+/494817 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Julia Lavrova <jlavrova@google.com>
2022-01-13 18:53:00 +00:00
SKSL_TEST(SkSLMatrixScalarMath, "shared/MatrixScalarMath.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")
Fix flaws in minus-prefix optimization. We had a logic bug when attempting to optimize the following code: const vecN x = vecN(a, b, c); -x; The goal was to replace `-x` with `vecN(-a, -b, -c)` but we accidentally tried to cast the `x` VariableReference to a Constructor. We unfortunately didn't cover this in any of our test cases, but the fuzzer managed to synthesize it by mixing and matching elements from its new corpus. This affected several different constructor types: splat, diagonal- matrix, compound and array. Change-Id: I10dd2460ab26ba3e820b0cff5db091368fb7e648 Bug: oss-fuzz:37764, oss-fuzz:37861 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/443407 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-08-30 19:47:00 +00:00
SKSL_TEST(SkSLNegation, "shared/Negation.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(SkSLNumberCasts, "shared/NumberCasts.sksl")
SKSL_TEST(SkSLOperatorsES2, "shared/OperatorsES2.sksl")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_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")
Update additional OutParams tests to run on the GPU. Change-Id: If0ecc3c1080b8e44f17dbb34ff6cc1d66794ae0b Bug: skia:11052, skia:11919, skia:12858 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501843 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2022-01-31 16:14:07 +00:00
SKSL_TEST(SkSLOutParams, "shared/OutParams.sksl")
Fix up SkSL test on Wembley. Test "InlinerHonorsGLSLOutParamSemantics" was failing on Wembley devices and is now disabled on that GPU. Also, it turns out that the inliner has ignored functions with out params for a long time now, but our test names haven't been updated to account for this. So, did some additional cleanup: - "InlinerHonorsGLSLOutParamSemantics" (the test in question) has been moved to shared/ and renamed to "OutParamsAreDistinct." - Removed test "OutParamsNoInline" as it is functionally the same as "OutParams". Change-Id: I1431ed197b9216cb482eee4f5e4eb2579a5303f7 Bug: skia:12858 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502303 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com>
2022-01-31 19:35:08 +00:00
SKSL_TEST(SkSLOutParamsAreDistinct, "shared/OutParamsAreDistinct.sksl")
Update additional OutParams tests to run on the GPU. Change-Id: If0ecc3c1080b8e44f17dbb34ff6cc1d66794ae0b Bug: skia:11052, skia:11919, skia:12858 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501843 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2022-01-31 16:14:07 +00:00
SKSL_TEST(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")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(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(SkSLReturnsValueOnEveryPathES2, "shared/ReturnsValueOnEveryPathES2.sksl")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(SkSLReturnsValueOnEveryPathES3, "shared/ReturnsValueOnEveryPathES3.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")
Match GLSL scoping rules more closely in SkSL. GLSL treats builtin types and user-defined types differently; `int` and `float` are keywords and cannot be used to name variables. However, it's fine for a user type like `struct xyz` to be hidden by a variable `int xyz` or even `xyz xyz` (i.e., a variable of type `struct xyz` named `xyz`). We now honor that distinction and include tests for it. This will fix several ES2 conformance tests (local_struct_variable_hides_struct_type, local_int_variable_hides_struct_type, etc.). Change-Id: I7a45c70707087f9f355ce5b06b032fed16683f3e Bug: skia:12527 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/458721 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-10-12 20:53:52 +00:00
SKSL_TEST(SkSLScopedSymbol, "shared/ScopedSymbol.sksl")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_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")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(SkSLStaticSwitch, "shared/StaticSwitch.sksl")
Fix parsing error with structs containing arrays. Previously, a struct containing a vardecl with multiple declarations would interpret arrays incorrectly. An array would be applied to ALL variables in the decl after its initial appearance. That is, `int w, x[10], y, z;` would be interpreted as `int w, x[10], y[10], z[10];`. This is now fixed and our test case runs as expected. Change-Id: I5b4a617c58cdfb83face651effd42770a1f68638 Bug: oss-fuzz:37622 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441879 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-08-25 16:01:21 +00:00
SKSL_TEST(SkSLStructArrayFollowedByScalar, "shared/StructArrayFollowedByScalar.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")
Re-re-reland "Rewrite switch statements in GLSL strict-ES2 mode." This reverts commit 6f06bab632490b82a3cc73be76f8c5ad119ac092. Reason for revert: glslGeneration is more trustworthy than GR_GL_VER Original change's description: > Revert "Re-reland "Rewrite switch statements in GLSL strict-ES2 mode.""" > > This reverts commit 64560c7cd59b369c792f207cb0295b26978e2724. > > Reason for revert: Nexus5, also > > Original change's description: > > Re-reland "Rewrite switch statements in GLSL strict-ES2 mode."" > > > > This reverts commit c4c355940c9f5be879d1c1997724a4cf61e68b53. > > > > Reason for revert: disabled offending tests > > > > Original change's description: > > > Revert "Reland "Rewrite switch statements in GLSL strict-ES2 mode."" > > > > > > This reverts commit c81edd0e8cd999a92ae943f284ee31c25f0f9373. > > > > > > Reason for revert: ANGLE still unhappy > > > Original change's description: > > > > Reland "Rewrite switch statements in GLSL strict-ES2 mode." > > > > > > > > This reverts commit d26d0e6a47aea2575f29b4582a4f662a17a8fff2. > > > > > > > > Reason for revert: uses dedicated caps bit > > > > > > > > Original change's description: > > > > > Revert "Rewrite switch statements in GLSL strict-ES2 mode." > > > > > > > > > > This reverts commit 45e3838006df8bc393fe6f4ca1cff999b41167f4. > > > > > > > > > > Reason for revert: Also need to rewrite them in actual ES2 mode. > > > > > > > > > > Original change's description: > > > > > > Rewrite switch statements in GLSL strict-ES2 mode. > > > > > > > > > > > > Once this lands, switch statements will work everywhere--Metal, SPIR-V, > > > > > > GLSL, and SkVM. > > > > > > > > > > > > Change-Id: I2797d0a872de8be77bb9f7aa6acb93421d571d70 > > > > > > Bug: skia:12450 > > > > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452356 > > > > > > Commit-Queue: John Stiles <johnstiles@google.com> > > > > > > Auto-Submit: John Stiles <johnstiles@google.com> > > > > > > Reviewed-by: Brian Osman <brianosman@google.com> > > > > > > > > > > Bug: skia:12450 > > > > > Change-Id: I92656ed40289872405c0873f2c56a52b04e35b1d > > > > > No-Presubmit: true > > > > > No-Tree-Checks: true > > > > > No-Try: true > > > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452556 > > > > > Auto-Submit: Brian Osman <brianosman@google.com> > > > > > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > > > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > > > > > > > Bug: skia:12450 > > > > Change-Id: I0d3b0969d2040dbb4ee808132146687767c97442 > > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452560 > > > > 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> > > > > > > Bug: skia:12450 > > > Change-Id: I869cf3e2c47fe94981aa2ffa6c1f0b3e4d6e6862 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452717 > > > Auto-Submit: Brian Osman <brianosman@google.com> > > > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > > > Bug: skia:12450 > > Change-Id: Ia0e23e20794ea707e54be50123b5323369354a03 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452721 > > 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> > > Bug: skia:12450 > Change-Id: Id0c0cdfbf146000ec532e57e380c18ff391ca1da > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452896 > Auto-Submit: Brian Osman <brianosman@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12450 Change-Id: I4bac3a468ae20967fe6ec372561dd44f67c6b730 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452897 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-09-25 14:33:00 +00:00
SKSL_TEST(SkSLSwitch, "shared/Switch.sksl")
SKSL_TEST(SkSLSwitchDefaultOnly, "shared/SwitchDefaultOnly.sksl")
SKSL_TEST(SkSLSwitchWithFallthrough, "shared/SwitchWithFallthrough.sksl")
SKSL_TEST(SkSLSwitchWithLoops, "shared/SwitchWithLoops.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][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(SkSLSwizzleByIndex, "shared/SwizzleByIndex.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(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")
Add SkSL test for uniform arrays. These weren't used anywhere in our test suite. Change-Id: I35e8607ad2dbddf8f403668bd2b2636a8964d304 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455777 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-10-04 21:02:16 +00:00
SKSL_TEST(SkSLUniformArray, "shared/UniformArray.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(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")
Update VectorScalarMath test to run on GPU. This shakes out a few driver issues. Change-Id: I35041a904fb762a5b933b3e970f2d7a668803dcd Bug: skia:12858, skia:11919 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501019 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-01-27 18:37:24 +00:00
SKSL_TEST(SkSLVectorScalarMath, "shared/VectorScalarMath.sksl")
[sksl][tests] Restore SKSL_TEST_CPU_ES3 CPU-only behavior The SKSL_TEST_CPU_ES3 has been misinterpreted to mean that the tests should run on "SkVM and OpenGL" while it was originally meant for tests that were explicitly disabled on GPU backends. * This macro is now called "SKSL_TEST_CPU_NO_STRICT_ES2" and the comments reflect the fact that the tests are meant for CPU-only. * Removed the infra bot exceptions for the matrix constructor tests as they are now restricted to run only on CPU. Bug: skia:12970 Change-Id: I46dcec51ef6998f6a8a7b4610c39560da1e59057 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512578 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-24 17:54:11 +00:00
SKSL_TEST_GPU_ES3(SkSLWhileLoopControlFlow, "shared/WhileLoopControlFlow.sksl")
Reference in New Issue Copy Permalink