Beginning of support for texture rectangles.

src/gpu/glsl/GrGLSLShaderBuilder.cpp

Index: src/gpu/glsl/GrGLSLShaderBuilder.cpp
diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.cpp b/src/gpu/glsl/GrGLSLShaderBuilder.cpp
index 2d2ff8768eb8e46dbd86670fed06efcc29b2a224..f1ede1decd7ce6c589264a95e4805077d26c0a23 100644
--- a/src/gpu/glsl/GrGLSLShaderBuilder.cpp
+++ b/src/gpu/glsl/GrGLSLShaderBuilder.cpp
@@ -62,8 +62,9 @@ void GrGLSLShaderBuilder::appendTextureLookup(SkString* out,
                                               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);