From db10ed097fea43bc02cf26b11ba1932785ff09ee Mon Sep 17 00:00:00 2001
From: Brian Salomon <bsalomon@google.com>
Date: Fri, 27 Jul 2018 12:05:21 -0400
Subject: Remove unused kBufferSampler_GrSLType

Change-Id: I3e0476d92dfde928ef7d49155afdc3685c4ca03e
Reviewed-on: https://skia-review.googlesource.com/144023
Auto-Submit: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
---
 include/private/GrTypesPriv.h     | 7 -------
 src/gpu/GrProgramDesc.cpp         | 4 ----
 src/gpu/glsl/GrGLSL.cpp           | 2 --
 src/gpu/vk/GrVkUniformHandler.cpp | 2 --
 src/gpu/vk/GrVkVaryingHandler.cpp | 2 --
 5 files changed, 17 deletions(-)

diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h
index 11093068cf..47820f2db0 100644
--- a/include/private/GrTypesPriv.h
+++ b/include/private/GrTypesPriv.h
@@ -328,7 +328,6 @@ enum GrSLType {
     kTexture2DSampler_GrSLType,
     kTextureExternalSampler_GrSLType,
     kTexture2DRectSampler_GrSLType,
-    kBufferSampler_GrSLType,
     kTexture2D_GrSLType,
     kSampler_GrSLType,
 };
@@ -395,7 +394,6 @@ static inline bool GrSLTypeIsFloatType(GrSLType type) {
         case kTexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
-        case kBufferSampler_GrSLType:
         case kBool_GrSLType:
         case kByte_GrSLType:
         case kByte2_GrSLType:
@@ -479,7 +477,6 @@ static inline int GrSLTypeVecLength(GrSLType type) {
         case kTexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
-        case kBufferSampler_GrSLType:
         case kTexture2D_GrSLType:
         case kSampler_GrSLType:
             return -1;
@@ -516,7 +513,6 @@ static inline bool GrSLTypeIs2DCombinedSamplerType(GrSLType type) {
         case kInt4_GrSLType:
         case kUint_GrSLType:
         case kUint2_GrSLType:
-        case kBufferSampler_GrSLType:
         case kBool_GrSLType:
         case kByte_GrSLType:
         case kByte2_GrSLType:
@@ -547,7 +543,6 @@ static inline bool GrSLTypeIsCombinedSamplerType(GrSLType type) {
         case kTexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
-        case kBufferSampler_GrSLType:
             return true;
 
         case kVoid_GrSLType:
@@ -601,7 +596,6 @@ static inline bool GrSLTypeAcceptsPrecision(GrSLType type) {
         case kTexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
-        case kBufferSampler_GrSLType:
         case kTexture2D_GrSLType:
         case kSampler_GrSLType:
             return true;
@@ -679,7 +673,6 @@ static inline bool GrSLTypeTemporarilyAcceptsPrecision(GrSLType type) {
         case kTexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
-        case kBufferSampler_GrSLType:
         case kTexture2D_GrSLType:
         case kSampler_GrSLType:
             return true;
diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index d2dce7c4e5..f1524db555 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -34,10 +34,6 @@ static inline uint16_t image_storage_or_sampler_uniform_type_key(GrSLType type )
         case kTexture2DRectSampler_GrSLType:
             value = 2;
             break;
-        case kBufferSampler_GrSLType:
-            value = 3;
-            break;
-
         default:
             break;
     }
diff --git a/src/gpu/glsl/GrGLSL.cpp b/src/gpu/glsl/GrGLSL.cpp
index 807fe94176..d1881e5558 100644
--- a/src/gpu/glsl/GrGLSL.cpp
+++ b/src/gpu/glsl/GrGLSL.cpp
@@ -54,8 +54,6 @@ const char* GrGLSLTypeString(const GrShaderCaps* shaderCaps, GrSLType t) {
             return "samplerExternalOES";
         case kTexture2DRectSampler_GrSLType:
             return "sampler2DRect";
-        case kBufferSampler_GrSLType:
-            return "samplerBuffer";
         case kBool_GrSLType:
             return "bool";
         case kInt_GrSLType:
diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp
index 848d52a5cd..c4611a8bd2 100644
--- a/src/gpu/vk/GrVkUniformHandler.cpp
+++ b/src/gpu/vk/GrVkUniformHandler.cpp
@@ -79,7 +79,6 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) {
         case kTexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
-        case kBufferSampler_GrSLType:
         case kTexture2D_GrSLType:
         case kSampler_GrSLType:
             break;
@@ -164,7 +163,6 @@ static inline uint32_t grsltype_to_vk_size(GrSLType type) {
         case kTexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
-        case kBufferSampler_GrSLType:
         case kTexture2D_GrSLType:
         case kSampler_GrSLType:
             break;
diff --git a/src/gpu/vk/GrVkVaryingHandler.cpp b/src/gpu/vk/GrVkVaryingHandler.cpp
index d210aba18f..2f7bb5bc04 100644
--- a/src/gpu/vk/GrVkVaryingHandler.cpp
+++ b/src/gpu/vk/GrVkVaryingHandler.cpp
@@ -60,8 +60,6 @@ static inline int grsltype_to_location_size(GrSLType type) {
              return 0;
         case kTexture2DRectSampler_GrSLType:
              return 0;
-        case kBufferSampler_GrSLType:
-             return 0;
         case kBool_GrSLType:
              return 1;
         case kInt_GrSLType: // fall through
-- 
cgit v1.2.3