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 40 matching lines @@
 };
 
 bool GrGLSLSupportsNamedFragmentShaderOutputs(GrGLSLGeneration);
 
 /**
  * Gets the name of the function that should be used to sample a 2D texture. Coord type is used
  * to indicate whether the texture is sampled using projective textured (kVec3f) or not (kVec2f).
  */
 inline const char* GrGLSLTexture2DFunctionName(GrSLType coordType, GrSLType samplerType,
                                                GrGLSLGeneration glslGen) {
-    SkASSERT(GrSLTypeIs2DTextureType(samplerType));
+    SkASSERT(GrSLTypeIs2DCombinedSamplerType(samplerType));
     SkASSERT(kVec2f_GrSLType == coordType || kVec3f_GrSLType == coordType);
     // GL_TEXTURE_RECTANGLE_ARB is written against OpenGL 2.0/GLSL 1.10. At that time there were
     // separate texture*() functions. In OpenGL 3.0/GLSL 1.30 the different texture*() functions
     // were deprecated in favor or the unified texture() function. RECTANGLE textures became
     // standard in OpenGL 3.2/GLSL 1.50 and use texture(). It isn't completely clear what function
     // should be used for RECTANGLE textures in GLSL versions >= 1.30 && < 1.50. We're going with
     // using texture().
     if (glslGen >= k130_GrGLSLGeneration) {
         return (kVec2f_GrSLType == coordType) ? "texture" : "textureProj";
     }
     if (kVec2f_GrSLType == coordType) {
-        return (samplerType == kSampler2DRect_GrSLType) ? "texture2DRect" : "texture2D";
+        return (samplerType == kTexture2DRectSampler_GrSLType) ? "texture2DRect" : "texture2D";
     } else {
-        return (samplerType == kSampler2DRect_GrSLType) ? "texture2DRectProj" : "texture2DProj";
+        return (samplerType == kTexture2DRectSampler_GrSLType) ? "texture2DRectProj"
+                                                               : "texture2DProj";
     }
 }
 
 /**
  * Adds a line of GLSL code to declare the default precision for float types.
  */
 void GrGLSLAppendDefaultFloatPrecisionDeclaration(GrSLPrecision,
                                                   const GrGLSLCaps& glslCaps,
                                                   SkString* out);
 
@@ skipping 28 matching lines @@
         case kVec3f_GrSLType:
             return "vec3";
         case kVec4f_GrSLType:
             return "vec4";
         case kMat22f_GrSLType:
             return "mat2";
         case kMat33f_GrSLType:
             return "mat3";
         case kMat44f_GrSLType:
             return "mat4";
-        case kSampler2D_GrSLType:
+        case kTexture2DSampler_GrSLType:
             return "sampler2D";
-        case kSamplerExternal_GrSLType:
+        case kTextureExternalSampler_GrSLType:
             return "samplerExternalOES";
-        case kSampler2DRect_GrSLType:
+        case kTexture2DRectSampler_GrSLType:
             return "sampler2DRect";
-        case kSamplerBuffer_GrSLType:
+        case kTextureBufferSampler_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