fixed sksl static ifs to work for CircleEffect

static ifs (and switches) in .fp files are a bit tricky, because they
aren't necessarily static when the CPP file is being produced. They
become static when the CPP file produces the final SkSL; at this point
the final values of the 'in' variables are known.

This change permits 'deferred' static ifs and switches. The initial
compilation (.fp -> .cpp) passes the @if / @switch through, and then
the final compilation (.cpp's generated SkSL -> GLSL or whatever)
enforces the static test.

Bug: skia:
Change-Id: I0087dfe1725c8fd350507ac77f64db1d82659cdf
Reviewed-on: https://skia-review.googlesource.com/23403
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/sksl/SkSLMain.cpp b/src/sksl/SkSLMain.cpp
index 3e3d747304..9f1fec1f1b 100644
--- a/src/sksl/SkSLMain.cpp
+++ b/src/sksl/SkSLMain.cpp
@@ -95,7 +95,7 @@ int main(int argc, const char** argv) {
         }
     } else if (name.endsWith(".h")) {
         SkSL::FileOutputStream out(argv[2]);
-        SkSL::Compiler compiler;
+        SkSL::Compiler compiler(SkSL::Compiler::kPermitInvalidStaticTests_Flag);
         if (!out.isValid()) {
             printf("error writing '%s'\n", argv[2]);
             exit(4);
@@ -112,7 +112,7 @@ int main(int argc, const char** argv) {
         }
     } else if (name.endsWith(".cpp")) {
         SkSL::FileOutputStream out(argv[2]);
-        SkSL::Compiler compiler;
+        SkSL::Compiler compiler(SkSL::Compiler::kPermitInvalidStaticTests_Flag);
         if (!out.isValid()) {
             printf("error writing '%s'\n", argv[2]);
             exit(4);