Beginning of support for texture rectangles.

src/gpu/glsl/GrGLSLShaderBuilder.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrSwizzle.h"
 #include "glsl/GrGLSLShaderBuilder.h"
 #include "glsl/GrGLSLCaps.h"
@@ skipping 44 matching lines @@
     this->functions().append(body);
     this->functions().append("}\n\n");
 }
 
 void GrGLSLShaderBuilder::appendTextureLookup(SkString* out,
                                               const GrGLSLTextureSampler& sampler,
                                               const char* coordName,
                                               GrSLType varyingType) const {
     const GrGLSLCaps* glslCaps = fProgramBuilder->glslCaps();
     GrGLSLUniformHandler* uniformHandler = fProgramBuilder->uniformHandler();
+    GrSLType samplerType = uniformHandler->getUniformVariable(sampler.fSamplerUniform).getType();
     out->appendf("%s(%s, %s)",
-                 GrGLSLTexture2DFunctionName(varyingType, glslCaps->generation()),
+                 GrGLSLTexture2DFunctionName(varyingType, samplerType, glslCaps->generation()),
                  uniformHandler->getUniformCStr(sampler.fSamplerUniform),
                  coordName);
 
     // This refers to any swizzling we may need to get from some backend internal format to the
     // format used in GrPixelConfig. If this is implemented by the GrGpu object, then swizzle will
     // be rgba. For shader prettiness we omit the swizzle rather than appending ".rgba".
     const GrSwizzle& configSwizzle = glslCaps->configTextureSwizzle(sampler.config());
 
     if (configSwizzle != GrSwizzle::RGBA()) {
         out->appendf(".%s", configSwizzle.c_str());
@@ skipping 70 matching lines @@
     this->code().append("}");
 
     for (int i = 0; i <= fCodeIndex; i++) {
         fCompilerStrings[i] = fShaderStrings[i].c_str();
         fCompilerStringLengths[i] = (int)fShaderStrings[i].size();
     }
 
     fFinalized = true;
 }