commit 3f6f76f98b6b37d17d1492791ff0feb1b7586bd6
author cdalton <cdalton@nvidia.com> Mon Apr 11 12:18:09 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Apr 11 12:18:09 2016 -0700
tree f9d4ea6d87cfe9f1f05626eaac549e163bd00638
parent a6b92ad1f7b79106caef6a4c721903544f507a02

Rename EmitArgs::fSamplers to fTexSamplers

Renames fSamplers to fTexSamplers in GrProcessor EmitArgs, and renames
GrGLSLTextureSampler to GrGLSLSampler. This will allow us to add a
second array of buffer samplers.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1862373003

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

src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
index 4f1dabe..eb4fe0a 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
@@ -278,7 +278,7 @@
                     tName.c_str(),
                     args.fOutputColor,
                     args.fInputColor,
-                    args.fSamplers);
+                    args.fTexSamplers);
     fragBuilder->codeAppend("\t}\n");
 }
 
@@ -545,7 +545,7 @@
                     tName.c_str(),
                     args.fOutputColor,
                     args.fInputColor,
-                    args.fSamplers);
+                    args.fTexSamplers);
     fragBuilder->codeAppend("\t}\n");
 }
 
@@ -729,7 +729,7 @@
                     tName.c_str(),
                     args.fOutputColor,
                     args.fInputColor,
-                    args.fSamplers);
+                    args.fTexSamplers);
 }
 
 void GLFocalInside2PtConicalEffect::onSetData(const GrGLSLProgramDataManager& pdman,
@@ -994,7 +994,7 @@
                     tName.c_str(),
                     args.fOutputColor,
                     args.fInputColor,
-                    args.fSamplers);
+                    args.fTexSamplers);
 }
 
 void GLCircleInside2PtConicalEffect::onSetData(const GrGLSLProgramDataManager& pdman,
@@ -1245,7 +1245,7 @@
                     tName.c_str(),
                     args.fOutputColor,
                     args.fInputColor,
-                    args.fSamplers);
+                    args.fTexSamplers);
     fragBuilder->codeAppend("\t}\n");
 }