Switch atlas clients over to using absolute texture coordinates (take 2)

This is a prerequisite for being able to resize the atlas with impunity.

Change-Id: Iccc9c7ced43f38a7d8483a7bd12a458d59a3453a
Reviewed-on: https://skia-review.googlesource.com/38362
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

1 files changed, 1 insertions, 52 deletions

diff --git a/include/private/GrGLSL.h b/include/private/GrGLSL.h
index 087b869044..23a575462c 100644
--- a/include/private/GrGLSL.h
+++ b/include/private/GrGLSL.h
@@ -85,57 +85,6 @@ static inline const char* GrGLSLPrecisionString(GrSLPrecision p) {
 /**
  * Converts a GrSLType to a string containing the name of the equivalent GLSL type.
  */
-static inline const char* GrGLSLTypeString(GrSLType t) {
-    switch (t) {
-        case kVoid_GrSLType:
-            return "void";
-        case kFloat_GrSLType:
-            return "float";
-        case kVec2f_GrSLType:
-            return "float2";
-        case kVec3f_GrSLType:
-            return "float3";
-        case kVec4f_GrSLType:
-            return "float4";
-        case kVec2i_GrSLType:
-            return "int2";
-        case kVec3i_GrSLType:
-            return "int3";
-        case kVec4i_GrSLType:
-            return "int4";
-        case kMat22f_GrSLType:
-            return "float2x2";
-        case kMat33f_GrSLType:
-            return "float3x3";
-        case kMat44f_GrSLType:
-            return "float4x4";
-        case kTexture2DSampler_GrSLType:
-            return "sampler2D";
-        case kITexture2DSampler_GrSLType:
-            return "isampler2D";
-        case kTextureExternalSampler_GrSLType:
-            return "samplerExternalOES";
-        case kTexture2DRectSampler_GrSLType:
-            return "sampler2DRect";
-        case kBufferSampler_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";
-        case kImageStorage2D_GrSLType:
-            return "image2D";
-        case kIImageStorage2D_GrSLType:
-            return "iimage2D";
-    }
-    SK_ABORT("Unknown shader var type.");
-    return ""; // suppress warning
-}
+const char* GrGLSLTypeString(const GrShaderCaps* shaderCaps, GrSLType t);
 
 #endif