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>
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: