commit a8f0002f0c2f23167f1e6b3ae3f77d3c7768cac3
author Brian Salomon <bsalomon@google.com> Wed Nov 16 12:55:57 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 16 19:27:27 2016 +0000
tree 3124b8ddf07c731e75746d3cbcc733e1f647049e
parent a9312fd56e2209f56222f822eb10ed0c25a42724

Rename kTexture2DISampler to kITexture2DSampler.

Also remove unused kGrSLTypeCount.

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4903

Change-Id: I7f934c56515424b2668886dec2f16296a1256e2c
Reviewed-on: https://skia-review.googlesource.com/4903
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>

include/gpu/GrTypesPriv.h

diff --git a/include/gpu/GrTypesPriv.h b/include/gpu/GrTypesPriv.h
index 2fa4c3a..72ae2f7 100644
--- a/include/gpu/GrTypesPriv.h
+++ b/include/gpu/GrTypesPriv.h
@@ -28,16 +28,13 @@
     kMat33f_GrSLType,
     kMat44f_GrSLType,
     kTexture2DSampler_GrSLType,
-    kTexture2DISampler_GrSLType,
+    kITexture2DSampler_GrSLType,
     kTextureExternalSampler_GrSLType,
     kTexture2DRectSampler_GrSLType,
     kTextureBufferSampler_GrSLType,
     kTexture2D_GrSLType,
     kSampler_GrSLType,
-
-    kLast_GrSLType = kSampler_GrSLType
 };
-static const int kGrSLTypeCount = kLast_GrSLType + 1;
 
 enum GrShaderType {
     kVertex_GrShaderType,
@@ -97,7 +94,7 @@
 
         case kVoid_GrSLType:
         case kTexture2DSampler_GrSLType:
-        case kTexture2DISampler_GrSLType:
+        case kITexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
         case kTextureBufferSampler_GrSLType:
@@ -115,7 +112,7 @@
 static inline bool GrSLTypeIs2DCombinedSamplerType(GrSLType type) {
     switch (type) {
         case kTexture2DSampler_GrSLType:
-        case kTexture2DISampler_GrSLType:
+        case kITexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
             return true;
@@ -143,7 +140,7 @@
 static inline bool GrSLTypeIsCombinedSamplerType(GrSLType type) {
     switch (type) {
         case kTexture2DSampler_GrSLType:
-        case kTexture2DISampler_GrSLType:
+        case kITexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
         case kTextureBufferSampler_GrSLType:
@@ -180,7 +177,7 @@
         case kMat33f_GrSLType:
         case kMat44f_GrSLType:
         case kTexture2DSampler_GrSLType:
-        case kTexture2DISampler_GrSLType:
+        case kITexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
         case kTextureBufferSampler_GrSLType:

src/gpu/gl/GrGLGpu.h

diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h
index 0c40b60..da0eae0 100644
--- a/src/gpu/gl/GrGLGpu.h
+++ b/src/gpu/gl/GrGLGpu.h
@@ -617,7 +617,7 @@
         switch (texture->texturePriv().samplerType()) {
             case kTexture2DSampler_GrSLType:
                 return 0;
-            case kTexture2DISampler_GrSLType:
+            case kITexture2DSampler_GrSLType:
                 return 1;
             case kTexture2DRectSampler_GrSLType:
                 return 2;

src/gpu/gl/GrGLTexture.cpp

diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp
index 9f213fb..0174452 100644
--- a/src/gpu/gl/GrGLTexture.cpp
+++ b/src/gpu/gl/GrGLTexture.cpp
@@ -23,7 +23,7 @@
         SkASSERT(!GrPixelConfigIsSint(config));
         return kTexture2DRectSampler_GrSLType;
     } else if (GrPixelConfigIsSint(config)) {
-        return kTexture2DISampler_GrSLType;
+        return kITexture2DSampler_GrSLType;
     } else {
         SkASSERT(idDesc.fInfo.fTarget == GR_GL_TEXTURE_2D);
         return kTexture2DSampler_GrSLType;

src/gpu/glsl/GrGLSL.h

diff --git a/src/gpu/glsl/GrGLSL.h b/src/gpu/glsl/GrGLSL.h
index 93eee31..872c618 100644
--- a/src/gpu/glsl/GrGLSL.h
+++ b/src/gpu/glsl/GrGLSL.h
@@ -128,7 +128,7 @@
             return "mat4";
         case kTexture2DSampler_GrSLType:
             return "sampler2D";
-        case kTexture2DISampler_GrSLType:
+        case kITexture2DSampler_GrSLType:
             return "isampler2D";
         case kTextureExternalSampler_GrSLType:
             return "samplerExternalOES";

src/gpu/vk/GrVkUniformHandler.cpp

diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp
index 612d0db..dcfefbf 100644
--- a/src/gpu/vk/GrVkUniformHandler.cpp
+++ b/src/gpu/vk/GrVkUniformHandler.cpp
@@ -39,7 +39,7 @@
         case kVoid_GrSLType:
         case kBool_GrSLType:
         case kTexture2DSampler_GrSLType:
-        case kTexture2DISampler_GrSLType:
+        case kITexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
         case kTextureBufferSampler_GrSLType:
@@ -80,7 +80,7 @@
         case kVoid_GrSLType:
         case kBool_GrSLType:
         case kTexture2DSampler_GrSLType:
-        case kTexture2DISampler_GrSLType:
+        case kITexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
         case kTextureBufferSampler_GrSLType:

src/gpu/vk/GrVkVaryingHandler.cpp

diff --git a/src/gpu/vk/GrVkVaryingHandler.cpp b/src/gpu/vk/GrVkVaryingHandler.cpp
index 988e62c..7ea2f18 100644
--- a/src/gpu/vk/GrVkVaryingHandler.cpp
+++ b/src/gpu/vk/GrVkVaryingHandler.cpp
@@ -29,7 +29,7 @@
             return 4;
         case kTexture2DSampler_GrSLType:
             return 0;
-        case kTexture2DISampler_GrSLType:
+        case kITexture2DSampler_GrSLType:
              return 0;
         case kTextureExternalSampler_GrSLType:
              return 0;