diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gpu/gl/GrGLGpu.h | 2 | ||||
-rw-r--r-- | src/gpu/gl/GrGLTexture.cpp | 2 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSL.h | 2 | ||||
-rw-r--r-- | src/gpu/vk/GrVkUniformHandler.cpp | 4 | ||||
-rw-r--r-- | src/gpu/vk/GrVkVaryingHandler.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h index 0c40b60862..da0eae07df 100644 --- a/src/gpu/gl/GrGLGpu.h +++ b/src/gpu/gl/GrGLGpu.h @@ -617,7 +617,7 @@ private: switch (texture->texturePriv().samplerType()) { case kTexture2DSampler_GrSLType: return 0; - case kTexture2DISampler_GrSLType: + case kITexture2DSampler_GrSLType: return 1; case kTexture2DRectSampler_GrSLType: return 2; diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp index 9f213fbc83..01744521ac 100644 --- a/src/gpu/gl/GrGLTexture.cpp +++ b/src/gpu/gl/GrGLTexture.cpp @@ -23,7 +23,7 @@ static inline GrSLType sampler_type(const GrGLTexture::IDDesc& idDesc, GrPixelCo 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; diff --git a/src/gpu/glsl/GrGLSL.h b/src/gpu/glsl/GrGLSL.h index 93eee31b7c..872c618db8 100644 --- a/src/gpu/glsl/GrGLSL.h +++ b/src/gpu/glsl/GrGLSL.h @@ -128,7 +128,7 @@ static inline const char* GrGLSLTypeString(GrSLType t) { return "mat4"; case kTexture2DSampler_GrSLType: return "sampler2D"; - case kTexture2DISampler_GrSLType: + case kITexture2DSampler_GrSLType: return "isampler2D"; case kTextureExternalSampler_GrSLType: return "samplerExternalOES"; diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp index 612d0db937..dcfefbfffd 100644 --- a/src/gpu/vk/GrVkUniformHandler.cpp +++ b/src/gpu/vk/GrVkUniformHandler.cpp @@ -39,7 +39,7 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) { 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 @@ static inline uint32_t grsltype_to_vk_size(GrSLType type) { case kVoid_GrSLType: case kBool_GrSLType: case kTexture2DSampler_GrSLType: - case kTexture2DISampler_GrSLType: + case kITexture2DSampler_GrSLType: case kTextureExternalSampler_GrSLType: case kTexture2DRectSampler_GrSLType: case kTextureBufferSampler_GrSLType: diff --git a/src/gpu/vk/GrVkVaryingHandler.cpp b/src/gpu/vk/GrVkVaryingHandler.cpp index 988e62cda0..7ea2f189f3 100644 --- a/src/gpu/vk/GrVkVaryingHandler.cpp +++ b/src/gpu/vk/GrVkVaryingHandler.cpp @@ -29,7 +29,7 @@ static inline int grsltype_to_location_size(GrSLType type) { return 4; case kTexture2DSampler_GrSLType: return 0; - case kTexture2DISampler_GrSLType: + case kITexture2DSampler_GrSLType: return 0; case kTextureExternalSampler_GrSLType: return 0; |