commit 57d3b039c635945e1dc2fcbac3462ed8bfedb068
author egdaniel <egdaniel@google.com> Fri Nov 13 11:57:27 2015 -0800
committer Commit bot <commit-bot@chromium.org> Fri Nov 13 11:57:27 2015 -0800
tree 1b119d77bc2f5dbb58587484f73f9ecbc4794039
parent 04d52f3a92bb3d72e035a7c002926953edb0b505

Rename some processor functions from GL to GLSL

TBR=bsalomon@google.com

BUG=skia:

Review URL: https://codereview.chromium.org/1443743002

src/gpu/GrFragmentProcessor.cpp

diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp
index 3741639..478fdb3 100644
--- a/src/gpu/GrFragmentProcessor.cpp
+++ b/src/gpu/GrFragmentProcessor.cpp
@@ -50,11 +50,11 @@
     return true;
 }
 
-GrGLSLFragmentProcessor* GrFragmentProcessor::createGLInstance() const {
-    GrGLSLFragmentProcessor* glFragProc = this->onCreateGLInstance();
+GrGLSLFragmentProcessor* GrFragmentProcessor::createGLSLInstance() const {
+    GrGLSLFragmentProcessor* glFragProc = this->onCreateGLSLInstance();
     glFragProc->fChildProcessors.push_back_n(fChildProcessors.count());
     for (int i = 0; i < fChildProcessors.count(); ++i) {
-        glFragProc->fChildProcessors[i] = fChildProcessors[i]->createGLInstance();
+        glFragProc->fChildProcessors[i] = fChildProcessors[i]->createGLSLInstance();
     }
     return glFragProc;
 }
@@ -147,7 +147,7 @@
         const char* name() const override { return "Premultiply"; }
 
     private:
-        GrGLSLFragmentProcessor* onCreateGLInstance() const override {
+        GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
             class GLFP : public GrGLSLFragmentProcessor {
             public:
                 GLFP() {}
@@ -163,7 +163,7 @@
             return new GLFP;
         }
 
-        void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override {}
+        void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override {}
 
         bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
 
@@ -220,7 +220,7 @@
 
         const char* name() const override { return "Replace Color"; }
 
-        GrGLSLFragmentProcessor* onCreateGLInstance() const override {
+        GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
             class GLFP : public GrGLSLFragmentProcessor {
             public:
                 GLFP() : fHaveSetColor(false) {}
@@ -259,7 +259,8 @@
         }
 
     private:
-        void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {}
+        void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override
+        {}
 
         bool onIsEqual(const GrFragmentProcessor& that) const override {
             return fColor == that.cast<ReplaceInputFragmentProcessor>().fColor;
@@ -297,7 +298,7 @@
 
         const char* name() const override { return "Series"; }
 
-        GrGLSLFragmentProcessor* onCreateGLInstance() const override {
+        GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
             class GLFP : public GrGLSLFragmentProcessor {
             public:
                 GLFP() {}
@@ -317,7 +318,7 @@
         }
 
     private:
-        void onGetGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override {}
+        void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override {}
 
         bool onIsEqual(const GrFragmentProcessor&) const override { return true; }