3 files changed, 0 insertions, 12 deletions
diff --git a/src/gpu/glsl/GrGLSL.cpp b/src/gpu/glsl/GrGLSL.cpp
index d1881e5558..848f571ee5 100644
--- a/src/gpu/glsl/GrGLSL.cpp
+++ b/src/gpu/glsl/GrGLSL.cpp
@@ -99,10 +99,6 @@ const char* GrGLSLTypeString(const GrShaderCaps* shaderCaps, GrSLType t) {
             return "ubyte3";
         case kUByte4_GrSLType:
             return "ubyte4";
-        case kTexture2D_GrSLType:
-            return "texture2D";
-        case kSampler_GrSLType:
-            return "sampler";
     }
     SK_ABORT("Unknown shader var type.");
     return ""; // suppress warning
diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp
index c4611a8bd2..3af61d0111 100644
--- a/src/gpu/vk/GrVkUniformHandler.cpp
+++ b/src/gpu/vk/GrVkUniformHandler.cpp
@@ -79,8 +79,6 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) {
         case kTexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
-        case kTexture2D_GrSLType:
-        case kSampler_GrSLType:
             break;
     }
     SK_ABORT("Unexpected type");
@@ -163,8 +161,6 @@ static inline uint32_t grsltype_to_vk_size(GrSLType type) {
         case kTexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
-        case kTexture2D_GrSLType:
-        case kSampler_GrSLType:
             break;
     }
     SK_ABORT("Unexpected type");
diff --git a/src/gpu/vk/GrVkVaryingHandler.cpp b/src/gpu/vk/GrVkVaryingHandler.cpp
index 2f7bb5bc04..5686f3e7a4 100644
--- a/src/gpu/vk/GrVkVaryingHandler.cpp
+++ b/src/gpu/vk/GrVkVaryingHandler.cpp
@@ -70,10 +70,6 @@ static inline int grsltype_to_location_size(GrSLType type) {
         case kUShort_GrSLType:
         case kUByte_GrSLType:
              return 1;
-        case kTexture2D_GrSLType:
-             return 0;
-        case kSampler_GrSLType:
-             return 0;
     }
     SK_ABORT("Unexpected type");
     return -1;