Add Texture2D and Sampler GrSLTypes

src/gpu/glsl/GrGLSL.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLSL_DEFINED
 #define GrGLSL_DEFINED
 
@@ skipping 117 matching lines @@
         case kSampler2DRect_GrSLType:
             return "sampler2DRect";
         case kSamplerBuffer_GrSLType:
             return "samplerBuffer";
         case kBool_GrSLType:
             return "bool";
         case kInt_GrSLType:
             return "int";
         case kUint_GrSLType:
             return "uint";
+        case kTexture2D_GrSLType:
+            return "texture2D";
+        case kSampler_GrSLType:
+            return "sampler";
         default:
             SkFAIL("Unknown shader var type.");
             return ""; // suppress warning
     }
 }
 
 /** A generic base-class representing a GLSL expression.
  * The instance can be a variable name, expression or vecN(0) or vecN(1). Does simple constant
  * folding with help of 1 and 0.
  *
@@ skipping 228 matching lines @@
 
 /**
  * Does an inplace mul, *=, of vec4VarName by mulFactor.
  * A semicolon is added after the assignment.
  */
 void GrGLSLMulVarBy4f(SkString* outAppend, const char* vec4VarName, const GrGLSLExpr4& mulFactor);
 
 #include "GrGLSL_impl.h"
 
 #endif