diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2016-12-09 17:22:59 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-12 16:42:34 +0000 |
commit | ce33f10677630e34187b661a02161378d8304d68 (patch) | |
tree | 570afa6dc9fc971ab1b886563a04b48cfd41156b /src/sksl/SkSLMain.cpp | |
parent | f44703a87f532b3f593d91605d66d52c6bbc45c9 (diff) |
added sk_FragCoord support to skslc
BUG=skia:
Change-Id: If78a4d08121699f87659f0d2e35f3edbf1867401
Reviewed-on: https://skia-review.googlesource.com/5408
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLMain.cpp')
-rw-r--r-- | src/sksl/SkSLMain.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/sksl/SkSLMain.cpp b/src/sksl/SkSLMain.cpp index 381fcf08d4..f493b0577d 100644 --- a/src/sksl/SkSLMain.cpp +++ b/src/sksl/SkSLMain.cpp @@ -37,6 +37,9 @@ int main(int argc, const char** argv) { 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 @@ int main(int argc, const char** argv) { 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 @@ int main(int argc, const char** argv) { 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); } |