commit 1386366e01c80531e8249a168c16271900f0ee9c
author Ethan Nicholas <ethannicholas@google.com> Mon Jul 29 13:05:15 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 29 17:37:38 2019 +0000
tree ca9fc8c74bba2e7ce39aafa771fa52941a3122b5
parent 1dfb4d25d177bc606e01ea3387694928ef10a2af

renamed SkSL texture() and process() to sample()

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

src/sksl/SkSLCPPCodeGenerator.cpp

diff --git a/src/sksl/SkSLCPPCodeGenerator.cpp b/src/sksl/SkSLCPPCodeGenerator.cpp
index f564f3c..df08f07 100644
--- a/src/sksl/SkSLCPPCodeGenerator.cpp
+++ b/src/sksl/SkSLCPPCodeGenerator.cpp
@@ -27,6 +27,7 @@
 , fFullName(String::printf("Gr%s", fName.c_str()))
 , fSectionAndParameterHelper(*program, *errors) {
     fLineEnding = "\\n";
+    fTextureFunctionOverride = "sample";
 }
 
 void CPPCodeGenerator::writef(const char* s, va_list va) {
@@ -404,18 +405,19 @@
 }
 
 void CPPCodeGenerator::writeFunctionCall(const FunctionCall& c) {
-    if (c.fFunction.fBuiltin && c.fFunction.fName == "process") {
+    if (c.fFunction.fBuiltin && c.fFunction.fName == "sample" &&
+        c.fArguments[0]->fType.kind() != Type::Kind::kSampler_Kind) {
         // Sanity checks that are detected by function definition in sksl_fp.inc
         SkASSERT(c.fArguments.size() == 1 || c.fArguments.size() == 2);
         SkASSERT("fragmentProcessor"  == c.fArguments[0]->fType.name() ||
                  "fragmentProcessor?" == c.fArguments[0]->fType.name());
 
         // Actually fail during compilation if arguments with valid types are
-        // provided that are not variable references, since process() is a
+        // provided that are not variable references, since sample() is a
         // special function that impacts code emission.
         if (c.fArguments[0]->fKind != Expression::kVariableReference_Kind) {
             fErrors.error(c.fArguments[0]->fOffset,
-                    "process()'s fragmentProcessor argument must be a variable reference\n");
+                    "sample()'s fragmentProcessor argument must be a variable reference\n");
             return;
         }
         if (c.fArguments.size() > 1) {
@@ -445,7 +447,7 @@
         }
 
         // Write the output handling after the possible input handling
-        String childName = "_child" + to_string(index);
+        String childName = "_sample" + to_string(c.fOffset);
         addExtraEmitCodeLine("SkString " + childName + "(\"" + childName + "\");");
         if (c.fArguments[0]->fType.kind() == Type::kNullable_Kind) {
             addExtraEmitCodeLine("if (_outer." + String(child.fName) + "_index >= 0) {\n    ");
@@ -468,7 +470,7 @@
         return;
     }
     INHERITED::writeFunctionCall(c);
-    if (c.fFunction.fBuiltin && c.fFunction.fName == "texture") {
+    if (c.fFunction.fBuiltin && c.fFunction.fName == "sample") {
         this->write(".%s");
         SkASSERT(c.fArguments.size() >= 1);
         SkASSERT(c.fArguments[0]->fKind == Expression::kVariableReference_Kind);