commit 552fcb9a1b821e70c7598c6926a3e684edf7089f
author Brian Osman <brianosman@google.com> Wed Apr 28 17:41:57 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 29 16:02:27 2021 +0000
tree 4db7750b15db146a1d5825397089c22400dc9084
parent fb7d378a1ac1a34bc360934f75ffa1088a2aa5fc

Remove flexible runtime effects entirely

All internal usage has migrated to MakeFor..., this removes the old
program kind, and updates some tests.

Bug: skia:11813
Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

tests/SkSLDSLTest.cpp

diff --git a/tests/SkSLDSLTest.cpp b/tests/SkSLDSLTest.cpp
index ca8bf6e..db57f89 100644
--- a/tests/SkSLDSLTest.cpp
+++ b/tests/SkSLDSLTest.cpp
@@ -1544,13 +1544,12 @@
 
 DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLSampleShader, r, ctxInfo) {
     AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), /*markVarsDeclared=*/true,
-                           SkSL::ProgramKind::kRuntimeEffect);
+                           SkSL::ProgramKind::kRuntimeShader);
     DSLVar shader(kUniform_Modifier, kShader_Type, "shader");
-    EXPECT_EQUAL(Sample(shader), "sample(shader)");
     EXPECT_EQUAL(Sample(shader, Float2(0, 0)), "sample(shader, float2(0.0, 0.0))");
 
     {
-        ExpectError error(r, "error: no match for sample(shader, half4)\n");
+        ExpectError error(r, "error: expected 'float2', but found 'half4'\n");
         Sample(shader, Half4(1)).release();
     }
 }