commit 941e7e2c9567ab1d8a3b2d1b0e3db71ee5eb75c9
author Ethan Nicholas <ethannicholas@google.com> Mon Dec 12 15:33:30 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 13 14:28:53 2016 +0000
tree 7f0ad6c5b2c3772d2c83be545fe04c53044746bd
parent 3dc73f3596d93a89f71b0c7e96d5d63dafeaf378

re-land of added sk_FragCoord support to skslc

BUG=skia:

Change-Id: Ifac1aa39839058787ad1794200c3dbb93c147a69
Reviewed-on: https://skia-review.googlesource.com/5850
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLMain.cpp

diff --git a/src/sksl/SkSLMain.cpp b/src/sksl/SkSLMain.cpp
index 381fcf0..f493b05 100644
--- a/src/sksl/SkSLMain.cpp
+++ b/src/sksl/SkSLMain.cpp
@@ -37,6 +37,9 @@
         printf("error reading '%s'\n", argv[1]);
         exit(2);
     }
+    SkSL::Program::Settings settings;
+    sk_sp<GrShaderCaps> caps = SkSL::ShaderCapsFactory::Default();
+    settings.fCaps = caps.get();
     SkString name(argv[2]);
     if (name.endsWith(".spirv")) {
         SkFILEWStream out(argv[2]);
@@ -45,7 +48,8 @@
             printf("error writing '%s'\n", argv[2]);
             exit(4);
         }
-        if (!compiler.toSPIRV(kind, text, out)) {
+        std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, text, settings);
+        if (!program || !compiler.toSPIRV(*program, out)) {
             printf("%s", compiler.errorText().c_str());
             exit(3);
         }
@@ -56,7 +60,8 @@
             printf("error writing '%s'\n", argv[2]);
             exit(4);
         }
-        if (!compiler.toGLSL(kind, text, *SkSL::ShaderCapsFactory::Default(), out)) {
+        std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, text, settings);
+        if (!program || !compiler.toGLSL(*program, out)) {
             printf("%s", compiler.errorText().c_str());
             exit(3);
         }