aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/SkSLErrorTest.cpp
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2018-07-31 09:44:36 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-31 15:18:03 +0000
commit0054311bf3b4f619a631e95d8aa1ea2d4bfd01c6 (patch)
treea3a48bece53f8a381c2a2e431db08f5055282e4f /tests/SkSLErrorTest.cpp
parentce3c7bbd0de68fda69903107461738b6afc8a3f4 (diff)
Re-re-land "added GrSkSLFP and converted DitherEffect to use it"
This reverts commit 6c48e4d11ce80fa5cfef56e13b2d5847fe94a7cc. Bug: skia: Change-Id: I7ee78990fc30eec545d1856e59eb6e0573089426 Reviewed-on: https://skia-review.googlesource.com/144348 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'tests/SkSLErrorTest.cpp')
-rw-r--r--tests/SkSLErrorTest.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp
index 432f35bff5..b84b1f3d8c 100644
--- a/tests/SkSLErrorTest.cpp
+++ b/tests/SkSLErrorTest.cpp
@@ -14,7 +14,11 @@ static void test_failure(skiatest::Reporter* r, const char* src, const char* err
SkSL::Program::Settings settings;
sk_sp<GrShaderCaps> caps = SkSL::ShaderCapsFactory::Default();
settings.fCaps = caps.get();
- compiler.convertProgram(SkSL::Program::kFragment_Kind, SkSL::String(src), settings);
+ std::unique_ptr<SkSL::Program> program = compiler.convertProgram(SkSL::Program::kFragment_Kind,
+ SkSL::String(src), settings);
+ if (!compiler.errorCount()) {
+ compiler.optimize(*program);
+ }
SkSL::String skError(error);
if (compiler.errorText() != skError) {
SkDebugf("SKSL ERROR:\n source: %s\n expected: %s received: %s", src, error,