commit 2e29ab5b03aa03372a34b8fcf51a85c41eaf8eeb
author Brian Osman <brianosman@google.com> Fri Sep 20 12:19:11 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Sep 20 17:13:57 2019 +0000
tree af1bac3b6d0876d12522398a8a367059a4d2423d
parent 40b05c390c176a7df183e115785c292b6577141a

added support for user-defined functions to GrSKSLFP

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

src/sksl/SkSLCompiler.cpp

diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 0e4de56..16a24f0 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -1531,12 +1531,17 @@
     return result;
 }
 
+#endif
+
+#if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU
 bool Compiler::toPipelineStage(const Program& program, String* out,
-                               std::vector<FormatArg>* outFormatArgs) {
+                               std::vector<FormatArg>* outFormatArgs,
+                               std::vector<GLSLFunction>* outFunctions) {
     SkASSERT(program.fIsOptimized);
     fSource = program.fSource.get();
     StringStream buffer;
-    PipelineStageCodeGenerator cg(fContext.get(), &program, this, &buffer, outFormatArgs);
+    PipelineStageCodeGenerator cg(fContext.get(), &program, this, &buffer, outFormatArgs,
+                                  outFunctions);
     bool result = cg.generateCode();
     fSource = nullptr;
     if (result) {
@@ -1544,7 +1549,6 @@
     }
     return result;
 }
-
 #endif
 
 std::unique_ptr<ByteCode> Compiler::toByteCode(Program& program) {