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/SkSLGLSLCodeGenerator.cpp

diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp
index 1079d96..61a7c11 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.cpp
+++ b/src/sksl/SkSLGLSLCodeGenerator.cpp
@@ -470,7 +470,7 @@
         (*fFunctionClasses)["min"]         = FunctionClass::kMin;
         (*fFunctionClasses)["pow"]         = FunctionClass::kPow;
         (*fFunctionClasses)["saturate"]    = FunctionClass::kSaturate;
-        (*fFunctionClasses)["texture"]     = FunctionClass::kTexture;
+        (*fFunctionClasses)["sample"]      = FunctionClass::kTexture;
         (*fFunctionClasses)["transpose"]   = FunctionClass::kTranspose;
     }
 #ifndef SKSL_STANDALONE
@@ -670,12 +670,16 @@
                         proj = false;
                         break;
                 }
-                this->write("texture");
-                if (fProgram.fSettings.fCaps->generation() < k130_GrGLSLGeneration) {
-                    this->write(dim);
-                }
-                if (proj) {
-                    this->write("Proj");
+                if (fTextureFunctionOverride != "") {
+                    this->write(fTextureFunctionOverride.c_str());
+                } else {
+                    this->write("texture");
+                    if (fProgram.fSettings.fCaps->generation() < k130_GrGLSLGeneration) {
+                        this->write(dim);
+                    }
+                    if (proj) {
+                        this->write("Proj");
+                    }
                 }
                 nameWritten = true;
                 break;