commit e76530dbdde39ce971e088149ba1e034fa1ff4a4
author Brian Osman <brianosman@google.com> Thu Sep 09 14:31:31 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Sep 14 14:54:03 2021 +0000
tree 2f9d627cb07bf4fe61cbee3baca82fe67669b1c7
parent ce32c8a074cc0b1a081e0104e3b0b050810eb49a

Replace DSL's Sample() with DSLGlobalVar::eval()

Bug: skia:12302
Change-Id: I7ff7bae388c5991f2c23c8945355fea55c42095a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/447436
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 8298609..a21ea76 100644
--- a/tests/SkSLDSLTest.cpp
+++ b/tests/SkSLDSLTest.cpp
@@ -1951,11 +1951,17 @@
     AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), default_settings(),
                            SkSL::ProgramKind::kRuntimeShader);
     DSLGlobalVar shader(kUniform_Modifier, kShader_Type, "child");
-    EXPECT_EQUAL(Sample(shader, Float2(0, 0)), "child.eval(float2(0.0, 0.0))");
+    DSLGlobalVar notShader(kUniform_Modifier, kFloat_Type, "x");
+    EXPECT_EQUAL(shader.eval(Float2(0, 0)), "child.eval(float2(0.0, 0.0))");
 
     {
-        ExpectError error(r, "no match for $eval(half4, shader)");
-        Sample(shader, Half4(1)).release();
+        ExpectError error(r, "no match for shader::eval(half4)");
+        shader.eval(Half4(1)).release();
+    }
+
+    {
+        ExpectError error(r, "type does not support method calls");
+        notShader.eval(Half4(1)).release();
     }
 }