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/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);