commit 34bcb9f80336fe0dc56ad5f67aeb0859bf84d92e
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 28 18:20:18 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 28 18:20:18 2012 +0000
tree b8f2dc4a54052cf700f9ef25e907df0e70f11dc4
parent 3578eb7d065ac5d9e9e7a6b8684b3ef1b3626fbd

Some GrGLShaderBuilder cleanup

Review URL: https://codereview.appspot.com/6500043/



git-svn-id: http://skia.googlecode.com/svn/trunk@5322 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/effects/GrColorTableEffect.cpp

diff --git a/src/gpu/effects/GrColorTableEffect.cpp b/src/gpu/effects/GrColorTableEffect.cpp
index 227c915..46e42603 100644
--- a/src/gpu/effects/GrColorTableEffect.cpp
+++ b/src/gpu/effects/GrColorTableEffect.cpp
@@ -69,26 +69,22 @@
 
     const GrTextureAccess& access = *fCustomStage.textureAccess(0);
     code->appendf("\t\t%s.a = ", outputColor);
-    builder->emitCustomTextureLookup(GrGLShaderBuilder::kDefault_SamplerMode,
-                                     access,
+    builder->emitCustomTextureLookup(access,
                                      samplerName,
                                      "vec2(coord.a, 0.125)");
 
     code->appendf("\t\t%s.r = ", outputColor);
-    builder->emitCustomTextureLookup(GrGLShaderBuilder::kDefault_SamplerMode,
-                                     access,
+    builder->emitCustomTextureLookup(access,
                                      samplerName,
                                      "vec2(coord.r, 0.375)");
 
     code->appendf("\t\t%s.g = ", outputColor);
-    builder->emitCustomTextureLookup(GrGLShaderBuilder::kDefault_SamplerMode,
-                                     access,
+    builder->emitCustomTextureLookup(access,
                                      samplerName,
                                      "vec2(coord.g, 0.625)");
 
     code->appendf("\t\t%s.b = ", outputColor);
-    builder->emitCustomTextureLookup(GrGLShaderBuilder::kDefault_SamplerMode,
-                                     access,
+    builder->emitCustomTextureLookup(access,
                                      samplerName,
                                      "vec2(coord.b, 0.875)");
 

src/gpu/effects/GrConfigConversionEffect.cpp

diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
index 1067906..fbf5a40 100644
--- a/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -24,7 +24,7 @@
                         const char* inputColor,
                         const char* samplerName) SK_OVERRIDE {
         builder->fFSCode.append("\tvec4 tempColor;\n");
-        builder->emitDefaultFetch("tempColor", samplerName);
+        builder->emitTextureLookupAndModulate("tempColor", samplerName);
         if (GrConfigConversionEffect::kNone_PMConversion == fPMConversion) {
             GrAssert(fSwapRedAndBlue);
             builder->fFSCode.appendf("\t%s = tempColor.bgra;\n", outputColor);

src/gpu/effects/GrConvolutionEffect.cpp

diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp
index 2cefbc4..162a0cc 100644
--- a/src/gpu/effects/GrConvolutionEffect.cpp
+++ b/src/gpu/effects/GrConvolutionEffect.cpp
@@ -75,7 +75,7 @@
     const char* imgInc = builder->getUniformCStr(fImageIncrementUni);
 
     code->appendf("\t\tvec2 coord = %s - %d.0 * %s;\n",
-                  builder->fSampleCoords.c_str(), fRadius, imgInc);
+                  builder->defaultTexCoordsName(), fRadius, imgInc);
 
     // Manually unroll loop because some drivers don't; yields 20-30% speedup.
     for (int i = 0; i < width; i++) {

src/gpu/effects/GrSingleTextureEffect.cpp

diff --git a/src/gpu/effects/GrSingleTextureEffect.cpp b/src/gpu/effects/GrSingleTextureEffect.cpp
index e1856c9..42a8bf9 100644
--- a/src/gpu/effects/GrSingleTextureEffect.cpp
+++ b/src/gpu/effects/GrSingleTextureEffect.cpp
@@ -23,7 +23,7 @@
                         const char* outputColor,
                         const char* inputColor,
                         const char* samplerName) SK_OVERRIDE {
-        builder->emitDefaultFetch(outputColor, samplerName);
+        builder->emitTextureLookupAndModulate(outputColor, samplerName);
     }
 
     static inline StageKey GenKey(const GrCustomStage&, const GrGLCaps&) { return 0; }

src/gpu/effects/GrTextureDomainEffect.cpp

diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp
index 9384b28..a67dd49 100644
--- a/src/gpu/effects/GrTextureDomainEffect.cpp
+++ b/src/gpu/effects/GrTextureDomainEffect.cpp
@@ -50,16 +50,12 @@
                                      const char* outputColor,
                                      const char* inputColor,
                                      const char* samplerName) {
-    SkString coordVar("clampCoord");
-    builder->fFSCode.appendf("\t%s %s = clamp(%s, %s.xy, %s.zw);\n",
-                           GrGLShaderVar::TypeString(GrSLFloatVectorType(builder->fCoordDims)),
-                           coordVar.c_str(),
-                           builder->fSampleCoords.c_str(),
+    builder->fFSCode.appendf("\tvec2 clampCoord = clamp(%s, %s.xy, %s.zw);\n",
+                           builder->defaultTexCoordsName(),
                            builder->getUniformCStr(fNameUni),
                            builder->getUniformCStr(fNameUni));
-    builder->fSampleCoords = coordVar;
 
-    builder->emitDefaultFetch(outputColor, samplerName);
+    builder->emitTextureLookupAndModulate(outputColor, samplerName, "clampCoord");
 }
 
 void GrGLTextureDomainEffect::setData(const GrGLUniformManager& uman,