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,
case kVoid_GrSLType:
case kTexture2DSampler_GrSLType:
- case kTexture2DISampler_GrSLType:
+ case kITexture2DSampler_GrSLType:
case kTextureExternalSampler_GrSLType:
case kTexture2DRectSampler_GrSLType:
case kTextureBufferSampler_GrSLType:
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;
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:
case kMat33f_GrSLType:
case kMat44f_GrSLType:
case kTexture2DSampler_GrSLType:
- case kTexture2DISampler_GrSLType:
+ case kITexture2DSampler_GrSLType:
case kTextureExternalSampler_GrSLType:
case kTexture2DRectSampler_GrSLType:
case kTextureBufferSampler_GrSLType:
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;
case kVoid_GrSLType:
case kBool_GrSLType:
case kTexture2DSampler_GrSLType:
- case kTexture2DISampler_GrSLType:
+ case kITexture2DSampler_GrSLType:
case kTextureExternalSampler_GrSLType:
case kTexture2DRectSampler_GrSLType:
case kTextureBufferSampler_GrSLType:
case kVoid_GrSLType:
case kBool_GrSLType:
case kTexture2DSampler_GrSLType:
- case kTexture2DISampler_GrSLType:
+ case kITexture2DSampler_GrSLType:
case kTextureExternalSampler_GrSLType:
case kTexture2DRectSampler_GrSLType:
case kTextureBufferSampler_GrSLType: