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>
diff --git a/gn/effects.gni b/gn/effects.gni
index 41778d4..ea8b670 100644
--- a/gn/effects.gni
+++ b/gn/effects.gni
@@ -23,6 +23,7 @@
"$_include/effects/SkLumaColorFilter.h",
"$_include/effects/SkOverdrawColorFilter.h",
"$_include/effects/SkPerlinNoiseShader.h",
+ "$_include/effects/SkRuntimeEffect.h",
"$_include/effects/SkShaderMaskFilter.h",
"$_include/effects/SkTableColorFilter.h",
"$_include/effects/SkTableMaskFilter.h",
diff --git a/gn/tests.gni b/gn/tests.gni
index 0ce7125..b14838f 100644
--- a/gn/tests.gni
+++ b/gn/tests.gni
@@ -271,6 +271,7 @@
"$_tests/SkSLMemoryLayoutTest.cpp",
"$_tests/SkSLMetalTestbed.cpp",
"$_tests/SkSLSPIRVTestbed.cpp",
+ "$_tests/SkSLTest.cpp",
"$_tests/SkScalerCacheTest.cpp",
"$_tests/SkShaperJSONWriterTest.cpp",
"$_tests/SkSharedMutexTest.cpp",
diff --git a/resources/sksl/folding/VectorScalarFolding.sksl b/resources/sksl/folding/VectorScalarFolding.sksl
index 4569f04..a7f2646 100644
--- a/resources/sksl/folding/VectorScalarFolding.sksl
+++ b/resources/sksl/folding/VectorScalarFolding.sksl
@@ -72,7 +72,7 @@
x = half4(unknown) * 0;
ok = ok && (x == half4(0));
x = half4(unknown) * 1;
- ok = ok && (x == half4(0));
+ ok = ok && (x == half4(unknown));
x = half4(unknown) - 0;
ok = ok && (x == half4(unknown));
@@ -153,7 +153,7 @@
x = int4(unknown) * 0;
ok = ok && (x == int4(0));
x = int4(unknown) * 1;
- ok = ok && (x == int4(0));
+ ok = ok && (x == int4(unknown));
x = int4(unknown) - 0;
ok = ok && (x == int4(unknown));
diff --git a/tests/SkSLTest.cpp b/tests/SkSLTest.cpp
new file mode 100644
index 0000000..5139c3f
--- /dev/null
+++ b/tests/SkSLTest.cpp
@@ -0,0 +1,103 @@
+/*
+ * 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"
+#include "include/utils/SkRandom.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
+
+static const SkRect kRect = SkRect::MakeWH(1, 1);
+
+static void test(skiatest::Reporter* r, SkSurface* surface, const char* testFile) {
+ SkString resourcePath = SkStringPrintf("sksl/%s", testFile);
+ sk_sp<SkData> shaderData = GetResourceAsData(resourcePath.c_str());
+ if (!shaderData) {
+ ERRORF(r, "%s: Unable to load file", testFile);
+ return;
+ }
+
+ SkString shaderString{reinterpret_cast<const char*>(shaderData->bytes()), shaderData->size()};
+ auto [effect, error] = SkRuntimeEffect::Make(shaderString);
+ if (!effect) {
+ ERRORF(r, "%s: %s", testFile, error.c_str());
+ return;
+ }
+
+ SkRuntimeShaderBuilder builder(effect);
+ sk_sp<SkShader> shader = builder.makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/true);
+ if (!shader) {
+ ERRORF(r, "%s: Unable to build shader", testFile);
+ return;
+ }
+
+ SkPaint paintShader;
+ paintShader.setShader(shader);
+ surface->getCanvas()->drawRect(kRect, paintShader);
+
+ SkBitmap bitmap;
+ REPORTER_ASSERT(r, bitmap.tryAllocPixels(surface->imageInfo()));
+ REPORTER_ASSERT(r, surface->readPixels(bitmap.info(), bitmap.getPixels(), bitmap.rowBytes(),
+ /*srcX=*/0, /*srcY=*/0));
+
+ SkColor color = bitmap.getColor(0, 0);
+ REPORTER_ASSERT(r, color == SkColorSetARGB(0xFF, 0x00, 0xFF, 0x00),
+ "Expected: solid green. Actual: A=%02X R=%02X G=%02X B=%02X.",
+ SkColorGetA(color), SkColorGetR(color), SkColorGetG(color), SkColorGetB(color));
+}
+
+static void test_cpu(skiatest::Reporter* r, const char* testFile) {
+ const SkImageInfo info = SkImageInfo::MakeN32Premul(kRect.width(), kRect.height());
+ sk_sp<SkSurface> surface(SkSurface::MakeRaster(info));
+
+ test(r, surface.get(), testFile);
+}
+
+static void test_gpu(skiatest::Reporter* r, GrDirectContext* ctx, const char* testFile) {
+ const SkImageInfo info = SkImageInfo::MakeN32Premul(kRect.width(), kRect.height());
+ sk_sp<SkSurface> surface(SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info));
+
+ test(r, surface.get(), testFile);
+}
+
+#define SKSL_TEST(name, path) \
+ DEF_TEST(name ## _CPU, r) { \
+ test_cpu(r, path); \
+ } \
+ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(name ## _GPU, r, ctxInfo) { \
+ test_gpu(r, ctxInfo.directContext(), path); \
+ }
+
+SKSL_TEST(SkSLBoolFolding, "folding/BoolFolding.sksl")
+SKSL_TEST(SkSLIntFoldingES2, "folding/IntFoldingES2.sksl")
+SKSL_TEST(SkSLMatrixFoldingES2, "folding/MatrixFoldingES2.sksl")
+SKSL_TEST(SkSLShortCircuitBoolFolding, "folding/ShortCircuitBoolFolding.sksl")
+SKSL_TEST(SkSLVectorScalarFolding, "folding/VectorScalarFolding.sksl")
+SKSL_TEST(SkSLVectorVectorFolding, "folding/VectorVectorFolding.sksl")
+
+/*
+TODO(johnstiles): Investigate failures on certain Android Vulkan devices, then re-enable this test.
+SKSL_TEST(SkSLFloatFolding, "folding/FloatFolding.sksl")
+*/
+
+/*
+TODO(skia:11209): enable these tests when Runtime Effects have support for ES3
+
+SKSL_TEST(SkSLIntFoldingES3, "folding/IntFoldingES3.sksl")
+SKSL_TEST(SkSLMatrixFoldingES3, "folding/MatrixFoldingES3.sksl")
+*/
diff --git a/tests/sksl/folding/VectorScalarFolding.glsl b/tests/sksl/folding/VectorScalarFolding.glsl
index 2c96574..d7b3684 100644
--- a/tests/sksl/folding/VectorScalarFolding.glsl
+++ b/tests/sksl/folding/VectorScalarFolding.glsl
@@ -57,7 +57,7 @@
x = ivec4(0);
ok = ok;
x = ivec4(unknown);
- ok = ok && x == ivec4(0);
+ ok = ok && x == ivec4(unknown);
x = ivec4(unknown);
ok = ok && x == ivec4(unknown);
return ok;
@@ -120,7 +120,7 @@
_2_x = vec4(0.0);
_1_ok = _1_ok;
_2_x = vec4(_3_unknown);
- _1_ok = _1_ok && _2_x == vec4(0.0);
+ _1_ok = _1_ok && _2_x == vec4(_3_unknown);
_2_x = vec4(_3_unknown);
_1_ok = _1_ok && _2_x == vec4(_3_unknown);
return _1_ok && test_int() ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
