AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Run unit tests to verify SkSL folding behavior."

Browse Source 
This reverts commit 4ecab92584.

Reason for revert: breaking all the vulkan bots

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>

TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com

Change-Id: Ife32f6c33d9ba7a9580b66eb312cffb249c43cb2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:11009
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357780
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Greg Daniel 2021-01-22 23:15:21 +00:00 committed by Skia Commit-Bot
parent e50b322e82
commit 95c2994048
5 changed files with 4 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gn/effects.gni
View File

@ -23,7 +23,6 @@ skia_effects_public = [
"$_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",

1
gn/tests.gni
View File

@ -271,7 +271,6 @@ tests_sources = [
"$_tests/SkSLMemoryLayoutTest.cpp",
"$_tests/SkSLMetalTestbed.cpp",
"$_tests/SkSLSPIRVTestbed.cpp",
"$_tests/SkSLTest.cpp",
"$_tests/SkScalerCacheTest.cpp",
"$_tests/SkShaperJSONWriterTest.cpp",
"$_tests/SkSharedMutexTest.cpp",

4
resources/sksl/folding/VectorScalarFolding.sksl
View File

@ -72,7 +72,7 @@ bool test_half() {
x = half4(unknown) * 0;
ok = ok && (x == half4(0));
x = half4(unknown) * 1;
ok = ok && (x == half4(unknown));
ok = ok && (x == half4(0));
x = half4(unknown) - 0;
ok = ok && (x == half4(unknown));
@ -153,7 +153,7 @@ bool test_int() {
x = int4(unknown) * 0;
ok = ok && (x == int4(0));
x = int4(unknown) * 1;
ok = ok && (x == int4(unknown));
ok = ok && (x == int4(0));
x = int4(unknown) - 0;
ok = ok && (x == int4(unknown));

122
tests/SkSLTest.cpp
View File

@ -1,122 +0,0 @@
/*
* 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"
sk_sp<SkShader> make_shader(skiatest::Reporter* r, 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 nullptr;
}
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 nullptr;
}
SkRuntimeShaderBuilder builder(effect);
sk_sp<SkShader> shader = builder.makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/true);
if (!shader) {
ERRORF(r, "%s: Unable to build shader", testFile);
return nullptr;
}
return shader;
}
static void test_cpu(skiatest::Reporter* r, const char* testFile) {
sk_sp<SkShader> shader = make_shader(r, testFile);
if (!shader) {
return;
}
static const SkRect kRect = SkRect::MakeWH(1, 1);
SkBitmap bitmap;
bitmap.allocN32Pixels(kRect.width(), kRect.height());
SkCanvas canvas(bitmap);
canvas.clear(0x00000000);
SkPaint paintShader;
paintShader.setShader(shader);
canvas.drawRect(kRect, paintShader);
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_gpu(skiatest::Reporter* r, GrDirectContext* ctx, const char* testFile) {
sk_sp<SkShader> shader = make_shader(r, testFile);
if (!shader) {
return;
}
static const SkRect kRect = SkRect::MakeWH(1, 1);
SkImageInfo info = SkImageInfo::Make(kRect.width(), kRect.height(),
kRGBA_8888_SkColorType, kPremul_SkAlphaType);
sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info);
SkCanvas* canvas = surface->getCanvas();
SkPaint paintShader;
paintShader.setShader(shader);
canvas->drawRect(kRect, paintShader);
SkBitmap bitmap;
bitmap.allocPixels(info);
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));
}
#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(SkSLFloatFolding, "folding/FloatFolding.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(skia:11209): enable these tests when Runtime Effects have support for ES3
DEF_TEST(SkSLIntFoldingES3, r) { test(r, "folding/IntFoldingES3.sksl"); }
DEF_TEST(SkSLMatrixFoldingES3, r) { test(r, "folding/MatrixFoldingES3.sksl"); }
*/

4
tests/sksl/folding/VectorScalarFolding.glsl
View File

@ -57,7 +57,7 @@ bool test_int() {
x = ivec4(0);
ok = ok;
x = ivec4(unknown);
ok = ok && x == ivec4(unknown);
ok = ok && x == ivec4(0);
x = ivec4(unknown);
ok = ok && x == ivec4(unknown);
return ok;
@ -120,7 +120,7 @@ vec4 main() {
_2_x = vec4(0.0);
_1_ok = _1_ok;
_2_x = vec4(_3_unknown);
_1_ok = _1_ok && _2_x == vec4(_3_unknown);
_1_ok = _1_ok && _2_x == vec4(0.0);
_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);