Revert "converted GrSimpleTextureEffect to sksl"

This reverts commit 46b654df9e70bbfacf6dc45d3a2a7ceb13a61edb.

Reason for revert: making Vulkan mad

Original change's description:
> converted GrSimpleTextureEffect to sksl
> 
> Bug: skia:
> Change-Id: If556c6baad75f22135f429759feabaaec095b900
> Reviewed-on: https://skia-review.googlesource.com/21720
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,ethannicholas@google.com

Change-Id: I06fac3d106435e1d58e19cc54a919c5d84784d92
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/22266
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

1 files changed, 12 insertions, 47 deletions

diff --git a/src/sksl/SkSLSectionAndParameterHelper.h b/src/sksl/SkSLSectionAndParameterHelper.h
index 4d2d7ec94d..f3242c3967 100644
--- a/src/sksl/SkSLSectionAndParameterHelper.h
+++ b/src/sksl/SkSLSectionAndParameterHelper.h
@@ -18,20 +18,18 @@
 namespace SkSL {
 
 #define CLASS_SECTION              "class"
-#define CONSTRUCTOR_SECTION        "constructor"
-#define CONSTRUCTOR_CODE_SECTION   "constructorCode"
-#define CONSTRUCTOR_PARAMS_SECTION "constructorParams"
-#define COORD_TRANSFORM_SECTION    "coordTransform"
 #define CPP_SECTION                "cpp"
 #define CPP_END_SECTION            "cppEnd"
 #define HEADER_SECTION             "header"
 #define HEADER_END_SECTION         "headerEnd"
+#define CONSTRUCTOR_PARAMS_SECTION "constructorParams"
+#define CONSTRUCTOR_SECTION        "constructor"
+#define CONSTRUCTOR_CODE_SECTION   "constructorCode"
+#define INITIALIZERS_SECTION       "initializers"
 #define EMIT_CODE_SECTION          "emitCode"
 #define FIELDS_SECTION             "fields"
-#define INITIALIZERS_SECTION       "initializers"
 #define MAKE_SECTION               "make"
 #define OPTIMIZATION_FLAGS_SECTION "optimizationFlags"
-#define SAMPLER_PARAMS_SECTION     "samplerParams"
 #define SET_DATA_SECTION           "setData"
 #define TEST_CODE_SECTION          "test"
 
@@ -67,12 +65,11 @@ public:
                         errors.error(s->fPosition,
                                      ("unsupported section '@" + s->fName + "'").c_str());
                     }
-                    if (!SectionPermitsDuplicates(s->fName.c_str()) &&
-                            fSections.find(s->fName) != fSections.end()) {
+                    if (fSections.find(s->fName) != fSections.end()) {
                         errors.error(s->fPosition,
                                      ("duplicate section '@" + s->fName + "'").c_str());
                     }
-                    fSections[s->fName].push_back(s);
+                    fSections[s->fName] = s;
                     break;
                 }
                 default:
@@ -81,28 +78,6 @@ public:
         }
     }
 
-    const Section* getSection(const char* name) {
-        ASSERT(!SectionPermitsDuplicates(name));
-        auto found = fSections.find(name);
-        if (found == fSections.end()) {
-            return nullptr;
-        }
-        ASSERT(found->second.size() == 1);
-        return found->second[0];
-    }
-
-    std::vector<const Section*> getSections(const char* name) {
-        auto found = fSections.find(name);
-        if (found == fSections.end()) {
-            return { };
-        }
-        return found->second;
-    }
-
-    const std::vector<const Variable*>& getParameters() {
-        return fParameters;
-    }
-
     static bool IsParameter(const Variable& var) {
         return (var.fModifiers.fFlags & Modifiers::kIn_Flag) &&
                -1 == var.fModifiers.fLayout.fBuiltin;
@@ -110,39 +85,29 @@ public:
 
     static bool IsSupportedSection(const char* name) {
         return !strcmp(name, CLASS_SECTION) ||
+               !strcmp(name, CPP_SECTION) ||
+               !strcmp(name, CPP_END_SECTION) ||
+               !strcmp(name, HEADER_SECTION) ||
+               !strcmp(name, HEADER_END_SECTION) ||
                !strcmp(name, CONSTRUCTOR_SECTION) ||
                !strcmp(name, CONSTRUCTOR_CODE_SECTION) ||
                !strcmp(name, CONSTRUCTOR_PARAMS_SECTION) ||
-               !strcmp(name, COORD_TRANSFORM_SECTION) ||
-               !strcmp(name, CPP_SECTION) ||
-               !strcmp(name, CPP_END_SECTION) ||
                !strcmp(name, EMIT_CODE_SECTION) ||
                !strcmp(name, FIELDS_SECTION) ||
-               !strcmp(name, HEADER_SECTION) ||
-               !strcmp(name, HEADER_END_SECTION) ||
                !strcmp(name, INITIALIZERS_SECTION) ||
                !strcmp(name, MAKE_SECTION) ||
                !strcmp(name, OPTIMIZATION_FLAGS_SECTION) ||
-               !strcmp(name, SAMPLER_PARAMS_SECTION) ||
                !strcmp(name, SET_DATA_SECTION) ||
                !strcmp(name, TEST_CODE_SECTION);
     }
 
     static bool SectionAcceptsArgument(const char* name) {
-        return !strcmp(name, COORD_TRANSFORM_SECTION) ||
-               !strcmp(name, SAMPLER_PARAMS_SECTION) ||
-               !strcmp(name, SET_DATA_SECTION) ||
+        return !strcmp(name, SET_DATA_SECTION) ||
                !strcmp(name, TEST_CODE_SECTION);
     }
 
-    static bool SectionPermitsDuplicates(const char* name) {
-        return !strcmp(name, COORD_TRANSFORM_SECTION) ||
-               !strcmp(name, SAMPLER_PARAMS_SECTION);
-    }
-
-private:
     std::vector<const Variable*> fParameters;
-    std::unordered_map<String, std::vector<const Section*>> fSections;
+    std::unordered_map<String, const Section*> fSections;
 };
 
 } // namespace SkSL