commit b5f0f52831fcf7cf26b053128fc866db06acf46f
author Brian Osman <brianosman@google.com> Thu Jul 23 13:28:14 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 24 19:23:20 2020 +0000
tree d070e883c1272c3f69f69cae1ddc8baf4bb7f805
parent 6b050f6beffc215beedd5762fcdbad1ec66a3fd4

SkSL: Salt inline identifiers in PipelineStage and FragmentProcessor passes

Fixes a bug with name conflicts in the final SkSL.

Bug: skia:10526
Change-Id: Ic238f89dd778c186e775ecbaabfbaed9e426274f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305563
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>

tests/SkRuntimeEffectTest.cpp

diff --git a/tests/SkRuntimeEffectTest.cpp b/tests/SkRuntimeEffectTest.cpp
index 9ec8234..e39c16c 100644
--- a/tests/SkRuntimeEffectTest.cpp
+++ b/tests/SkRuntimeEffectTest.cpp
@@ -196,6 +196,10 @@
     effect.test(0xFF000000, 0xFF00007F, 0xFF007F00, 0xFF007F7F,
                 [](SkCanvas* canvas, SkPaint*) { canvas->rotate(45.0f); });
 
+    //
+    // Sampling children
+    //
+
     // Sampling a null child should return the paint color
     effect.build("in shader child;",
                  "color = sample(child);");
@@ -222,6 +226,16 @@
                  "color = sample(child, float3x3(0, 1, 0, 1, 0, 0, 0, 0, 1));");
     effect.child("child") = rgbwShader;
     effect.test(0xFF0000FF, 0xFFFF0000, 0xFF00FF00, 0xFFFFFFFF);
+
+    //
+    // Helper functions
+    //
+
+    // Test case for inlining in the pipeline-stage and fragment-shader passes (skbug.com/10526):
+    effect.build("float2 helper(float2 x) { return x + 1; }",
+                 "float2 v = helper(p);"
+                 "color = half4(half2(v), 0, 1);");
+    effect.test(0xFF00FFFF);
 }
 
 DEF_TEST(SkRuntimeEffectSimple, r) {