Runtime Effects: Support 'uniform shader' (vs. 'in shader')

The previous behavior leaked Skia-internal concepts into public SkSL.
Users coming from GLSL will expect that bindable/sampleable objects are
uniform (just like texture2D). This keeps the old support around (and
tested), but updates all of our examples to use 'uniform'.

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

Author: brianosman

bench/ColorFilterBench.cpp

@@ -128,7 +128,7 @@ class ColorFilterBench final : public Benchmark {
 };
 
 const char RuntimeNone_GPU_SRC[] = R"(
-    in shader input;
+    uniform shader input;
     half4 main() { return sample(input); }
 )";
 
@@ -138,7 +138,7 @@ const char RuntimeColorMatrix_GPU_SRC[] = R"(
                  m5 , m6 , m7 , m8 , m9 ,
                  m10, m11, m12, m13, m14,
                  m15, m16, m17, m18, m19;
-    in shader input;
+    uniform shader input;
     half4 main() {
         half4 c = unpremul(sample(input));
 

gm/fp_sample_chaining.cpp

@@ -277,7 +277,7 @@ DEF_SIMPLE_GPU_GM(fp_sample_chaining, ctx, rtCtx, canvas, 380, 306) {
 }
 
 const char* gConstantMatrixSkSL = R"(
-    in shader child;
+    uniform shader child;
     half4 main(float2 xy) {
         return sample(child, float3x3(0.5, 0.0, 0.0,
                                       0.0, 1.0, 0.0,
@@ -286,7 +286,7 @@ const char* gConstantMatrixSkSL = R"(
 )";
 
 const char* gUniformMatrixSkSL = R"(
-    in shader child;
+    uniform shader child;
     uniform float3x3 matrix;
     half4 main(float2 xy) {
         return sample(child, matrix);
@@ -297,7 +297,7 @@ const char* gUniformMatrixSkSL = R"(
 // when scanning for sample matrices. With that pulled into a separate local, it's highly unlikely
 // we'll ever treat this as anything else.
 const char* gVariableMatrixSkSL = R"(
-    in shader child;
+    uniform shader child;
     uniform float3x3 matrix;
     half4 main(float2 xy) {
         float3x3 varMatrix = matrix * 0.5;
@@ -306,7 +306,7 @@ const char* gVariableMatrixSkSL = R"(
 )";
 
 const char* gExplicitCoordSkSL = R"(
-    in shader child;
+    uniform shader child;
     half4 main(float2 xy) {
         return sample(child, xy + float2(0, 8));
     }

gm/mixercolorfilter.cpp

@@ -110,8 +110,8 @@ class MixerCFGM final : public skiagm::GM {
         sk_sp<SkRuntimeEffect> effect;
         if (fRuntime) {
             const char* sksl = R"(
-                in shader cf0;
-                in shader cf1;
+                uniform shader cf0;
+                uniform shader cf1;
                 uniform half t;
                 half4 main() {
                     return mix(sample(cf0), sample(cf1), t);

gm/runtimecolorfilter.cpp

@@ -21,21 +21,21 @@
 #include <utility>
 
 const char* gNoop = R"(
-    in shader input;
+    uniform shader input;
     half4 main() {
         return sample(input);
     }
 )";
 
 const char* gLumaSrc = R"(
-    in shader input;
+    uniform shader input;
     half4 main() {
         return dot(sample(input).rgb, half3(0.3, 0.6, 0.1)).000r;
     }
 )";
 
 const char* gLumaSrcWithCoords = R"(
-    in shader input;
+    uniform shader input;
     half4 main(float2 p) {
         return dot(sample(input).rgb, half3(0.3, 0.6, 0.1)).000r;
     }
@@ -46,7 +46,7 @@ const char* gLumaSrcWithCoords = R"(
 
 // Simplest to run; hardest to write?
 const char* gTernary = R"(
-    in shader input;
+    uniform shader input;
     half4 main() {
         half4 color = sample(input);
         half luma = dot(color.rgb, half3(0.3, 0.6, 0.1));
@@ -60,7 +60,7 @@ const char* gTernary = R"(
 
 // Uses conditional if statements but no early return.
 const char* gIfs = R"(
-    in shader input;
+    uniform shader input;
     half4 main() {
         half4 color = sample(input);
         half luma = dot(color.rgb, half3(0.3, 0.6, 0.1));
@@ -79,7 +79,7 @@ const char* gIfs = R"(
 
 // Distilled from AOSP tone mapping shaders, more like what people tend to write.
 const char* gEarlyReturn = R"(
-    in shader input;
+    uniform shader input;
     half4 main() {
         half4 color = sample(input);
         half luma = dot(color.rgb, half3(0.3, 0.6, 0.1));

gm/runtimeshader.cpp

@@ -120,9 +120,9 @@ static sk_sp<SkShader> make_threshold(SkISize size) {
 class ThresholdRT : public RuntimeShaderGM {
 public:
     ThresholdRT() : RuntimeShaderGM("threshold_rt", {256, 256}, R"(
-        in shader before_map;
-        in shader after_map;
-        in shader threshold_map;
+        uniform shader before_map;
+        uniform shader after_map;
+        uniform shader threshold_map;
 
         uniform float cutoff;
         uniform float slope;
@@ -218,8 +218,8 @@ DEF_GM(return new SpiralRT;)
 class ColorCubeRT : public RuntimeShaderGM {
 public:
     ColorCubeRT() : RuntimeShaderGM("color_cube_rt", {512, 512}, R"(
-        in shader input;
-        in shader color_cube;
+        uniform shader input;
+        uniform shader color_cube;
 
         uniform float rg_scale;
         uniform float rg_bias;
@@ -303,7 +303,7 @@ class DefaultColorRT : public RuntimeShaderGM {
     // This test also *explicitly* doesn't include coords in main's parameter list, to test that
     // runtime shaders work without them being declared (when they're not used).
     DefaultColorRT() : RuntimeShaderGM("default_color_rt", {512, 256}, R"(
-        in shader input;
+        uniform shader input;
         half4 main() {
             return sample(input);
         }

gm/vertices.cpp

@@ -377,8 +377,8 @@ DEF_SIMPLE_GM(vertices_data_lerp, canvas, 256, 256) {
 
     SkPaint paint;
     const char* gProg = R"(
-        in shader c0;
-        in shader c1;
+        uniform shader c0;
+        uniform shader c1;
         varying float vtx_lerp;
         half4 main(float2 p) {
             half4 col0 = sample(c0, p);

modules/canvaskit/canvaskit/extra.html

@@ -333,9 +333,9 @@ <h2> Support for extended color spaces </h2>
     }
 
     const prog = `
-      in shader before_map;
-      in shader after_map;
-      in shader threshold_map;
+      uniform shader before_map;
+      uniform shader after_map;
+      uniform shader threshold_map;
 
       uniform float cutoff;
       uniform float slope;
@@ -503,8 +503,8 @@ <h2> Support for extended color spaces </h2>
     const children = [textureShader, normalShader];
 
     const prog = `
-      in shader color_map;
-      in shader normal_map;
+      uniform shader color_map;
+      uniform shader normal_map;
 
       uniform float3   lightPos;
       layout (marker=local_to_world)          uniform float4x4 localToWorld;

modules/canvaskit/tests/rtshader.spec.js

@@ -78,9 +78,9 @@ half4 main(float2 p) {
         .then((response) => response.arrayBuffer());
 
     const thresholdSkSL = `
-in shader before_map;
-in shader after_map;
-in shader threshold_map;
+uniform shader before_map;
+uniform shader after_map;
+uniform shader threshold_map;
 
 uniform float cutoff;
 uniform float slope;

modules/skottie/src/effects/BlackAndWhiteEffect.cpp

@@ -34,7 +34,7 @@ namespace  {
 
 static sk_sp<SkRuntimeEffect> make_effect() {
     static constexpr char BLACK_AND_WHITE_EFFECT[] = R"(
-        in shader input;
+        uniform shader input;
         uniform half kR, kY, kG, kC, kB, kM;
 
         half4 main() {

modules/skottie/src/effects/BrightnessContrastEffect.cpp

@@ -73,7 +73,7 @@ static constexpr char CONTRAST_EFFECT[] = R"(
     uniform half a;
     uniform half b;
     uniform half c;
-    in shader input;
+    uniform shader input;
 
     half4 main() {
         // C' = a*C^3 + b*C^2 + c*C
@@ -97,7 +97,7 @@ static sk_sp<SkData> make_contrast_coeffs(float contrast) {
 
 static constexpr char CONTRAST_EFFECT[] = R"(
     uniform half a;
-    in shader input;
+    uniform shader input;
 
     half4 main() {
         half4 color = sample(input);
@@ -124,7 +124,7 @@ static sk_sp<SkData> make_brightness_coeffs(float brightness) {
 
 static constexpr char BRIGHTNESS_EFFECT[] = R"(
     uniform half a;
-    in shader input;
+    uniform shader input;
 
     half4 main() {
         half4 color = sample(input);