diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-06-27 11:20:22 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-27 18:27:57 +0000 |
commit | c070939fd1a954b7a492bc30f0cf64a664b90181 (patch) | |
tree | 6b1167726bc9ac4d2073f893c699b40c70f63ba1 /src/sksl/SkSLMain.cpp | |
parent | 26249e0e1d1b18a1e67195a2998b49958426f8ba (diff) |
Re-land sksl fragment processor support
This reverts commit ed50200682e0de72c3abecaa4d5324ebcd1ed9f9.
Bug: skia:
Change-Id: I9caa7454b391450620d6989dc472abb3cf7a2cab
Reviewed-on: https://skia-review.googlesource.com/20965
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLMain.cpp')
-rw-r--r-- | src/sksl/SkSLMain.cpp | 68 |
1 files changed, 61 insertions, 7 deletions
diff --git a/src/sksl/SkSLMain.cpp b/src/sksl/SkSLMain.cpp index 1461bf9aae..ee868fb35e 100644 --- a/src/sksl/SkSLMain.cpp +++ b/src/sksl/SkSLMain.cpp @@ -5,11 +5,28 @@ * found in the LICENSE file. */ -#include "stdio.h" #include <fstream> #include "SkSLCompiler.h" #include "SkSLFileOutputStream.h" +// Given the path to a file (e.g. src/gpu/effects/GrFooFragmentProcessor.fp) and the expected +// filename prefix and suffix (e.g. "Gr" and ".fp"), returns the "base name" of the +// file (in this case, 'FooFragmentProcessor'). If no match, returns the empty string. +static SkSL::String base_name(const char* fpPath, const char* prefix, const char* suffix) { + SkSL::String result; + const char* end = fpPath + strlen(fpPath); + const char* fileName = end; + // back up until we find a slash + while (fileName != fpPath && '/' != *(fileName - 1) && '\\' != *(fileName - 1)) { + --fileName; + } + if (!strncmp(fileName, prefix, strlen(prefix)) && + !strncmp(end - strlen(suffix), suffix, strlen(suffix))) { + result.append(fileName + strlen(prefix), end - fileName - strlen(prefix) - strlen(suffix)); + } + return result; +} + /** * Very simple standalone executable to facilitate testing. */ @@ -19,15 +36,17 @@ int main(int argc, const char** argv) { exit(1); } SkSL::Program::Kind kind; - size_t len = strlen(argv[1]); - if (len > 5 && !strcmp(argv[1] + strlen(argv[1]) - 5, ".vert")) { + String input(argv[1]); + if (input.endsWith(".vert")) { kind = SkSL::Program::kVertex_Kind; - } else if (len > 5 && !strcmp(argv[1] + strlen(argv[1]) - 5, ".frag")) { + } else if (input.endsWith(".frag")) { kind = SkSL::Program::kFragment_Kind; - } else if (len > 5 && !strcmp(argv[1] + strlen(argv[1]) - 5, ".geom")) { + } else if (input.endsWith(".geom")) { kind = SkSL::Program::kGeometry_Kind; + } else if (input.endsWith(".fp")) { + kind = SkSL::Program::kFragmentProcessor_Kind; } else { - printf("input filename must end in '.vert', '.frag', or '.geom'\n"); + printf("input filename must end in '.vert', '.frag', '.geom', or '.fp'\n"); exit(1); } @@ -40,6 +59,7 @@ int main(int argc, const char** argv) { exit(2); } SkSL::Program::Settings settings; + settings.fArgs.insert(std::make_pair("gpImplementsDistanceVector", 1)); SkSL::String name(argv[2]); if (name.endsWith(".spirv")) { SkSL::FileOutputStream out(argv[2]); @@ -73,7 +93,41 @@ int main(int argc, const char** argv) { printf("error writing '%s'\n", argv[2]); exit(4); } + } else if (name.endsWith(".h")) { + SkSL::FileOutputStream out(argv[2]); + SkSL::Compiler compiler; + if (!out.isValid()) { + printf("error writing '%s'\n", argv[2]); + exit(4); + } + settings.fReplaceSettings = false; + std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, text, settings); + if (!program || !compiler.toH(*program, base_name(argv[1], "Gr", ".fp"), out)) { + printf("%s", compiler.errorText().c_str()); + exit(3); + } + if (!out.close()) { + printf("error writing '%s'\n", argv[2]); + exit(4); + } + } else if (name.endsWith(".cpp")) { + SkSL::FileOutputStream out(argv[2]); + SkSL::Compiler compiler; + if (!out.isValid()) { + printf("error writing '%s'\n", argv[2]); + exit(4); + } + settings.fReplaceSettings = false; + std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, text, settings); + if (!program || !compiler.toCPP(*program, base_name(argv[1], "Gr", ".fp"), out)) { + printf("%s", compiler.errorText().c_str()); + exit(3); + } + if (!out.close()) { + printf("error writing '%s'\n", argv[2]); + exit(4); + } } else { - printf("expected output filename to end with '.spirv' or '.glsl'"); + printf("expected output filename to end with '.spirv', '.glsl', '.cpp', or '.h'"); } } |