diff options
| -rw-r--r-- | include/private/GrTypesPriv.h | 65 | ||||
| -rw-r--r-- | src/gpu/glsl/GrGLSL.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkUniformHandler.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkVaryingHandler.cpp | 4 |
4 files changed, 0 insertions, 77 deletions
diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h index 47820f2db0..ecd95574f2 100644 --- a/include/private/GrTypesPriv.h +++ b/include/private/GrTypesPriv.h @@ -328,8 +328,6 @@ enum GrSLType { kTexture2DSampler_GrSLType, kTextureExternalSampler_GrSLType, kTexture2DRectSampler_GrSLType, - kTexture2D_GrSLType, - kSampler_GrSLType, }; enum GrShaderType { @@ -417,8 +415,6 @@ static inline bool GrSLTypeIsFloatType(GrSLType type) { case kInt4_GrSLType: case kUint_GrSLType: case kUint2_GrSLType: - case kTexture2D_GrSLType: - case kSampler_GrSLType: return false; } SK_ABORT("Unexpected type"); @@ -477,67 +473,12 @@ static inline int GrSLTypeVecLength(GrSLType type) { case kTexture2DSampler_GrSLType: case kTextureExternalSampler_GrSLType: case kTexture2DRectSampler_GrSLType: - case kTexture2D_GrSLType: - case kSampler_GrSLType: return -1; } SK_ABORT("Unexpected type"); return -1; } -static inline bool GrSLTypeIs2DCombinedSamplerType(GrSLType type) { - switch (type) { - case kTexture2DSampler_GrSLType: - case kTextureExternalSampler_GrSLType: - case kTexture2DRectSampler_GrSLType: - return true; - - case kVoid_GrSLType: - case kFloat_GrSLType: - case kFloat2_GrSLType: - case kFloat3_GrSLType: - case kFloat4_GrSLType: - case kFloat2x2_GrSLType: - case kFloat3x3_GrSLType: - case kFloat4x4_GrSLType: - case kHalf_GrSLType: - case kHalf2_GrSLType: - case kHalf3_GrSLType: - case kHalf4_GrSLType: - case kHalf2x2_GrSLType: - case kHalf3x3_GrSLType: - case kHalf4x4_GrSLType: - case kInt_GrSLType: - case kInt2_GrSLType: - case kInt3_GrSLType: - case kInt4_GrSLType: - case kUint_GrSLType: - case kUint2_GrSLType: - case kBool_GrSLType: - case kByte_GrSLType: - case kByte2_GrSLType: - case kByte3_GrSLType: - case kByte4_GrSLType: - case kUByte_GrSLType: - case kUByte2_GrSLType: - case kUByte3_GrSLType: - case kUByte4_GrSLType: - case kShort_GrSLType: - case kShort2_GrSLType: - case kShort3_GrSLType: - case kShort4_GrSLType: - case kUShort_GrSLType: - case kUShort2_GrSLType: - case kUShort3_GrSLType: - case kUShort4_GrSLType: - case kTexture2D_GrSLType: - case kSampler_GrSLType: - return false; - } - SK_ABORT("Unexpected type"); - return false; -} - static inline bool GrSLTypeIsCombinedSamplerType(GrSLType type) { switch (type) { case kTexture2DSampler_GrSLType: @@ -583,8 +524,6 @@ static inline bool GrSLTypeIsCombinedSamplerType(GrSLType type) { case kUShort2_GrSLType: case kUShort3_GrSLType: case kUShort4_GrSLType: - case kTexture2D_GrSLType: - case kSampler_GrSLType: return false; } SK_ABORT("Unexpected type"); @@ -596,8 +535,6 @@ static inline bool GrSLTypeAcceptsPrecision(GrSLType type) { case kTexture2DSampler_GrSLType: case kTextureExternalSampler_GrSLType: case kTexture2DRectSampler_GrSLType: - case kTexture2D_GrSLType: - case kSampler_GrSLType: return true; case kVoid_GrSLType: @@ -673,8 +610,6 @@ static inline bool GrSLTypeTemporarilyAcceptsPrecision(GrSLType type) { case kTexture2DSampler_GrSLType: case kTextureExternalSampler_GrSLType: case kTexture2DRectSampler_GrSLType: - case kTexture2D_GrSLType: - case kSampler_GrSLType: return true; case kVoid_GrSLType: diff --git a/src/gpu/glsl/GrGLSL.cpp b/src/gpu/glsl/GrGLSL.cpp index d1881e5558..848f571ee5 100644 --- a/src/gpu/glsl/GrGLSL.cpp +++ b/src/gpu/glsl/GrGLSL.cpp @@ -99,10 +99,6 @@ const char* GrGLSLTypeString(const GrShaderCaps* shaderCaps, GrSLType t) { return "ubyte3"; case kUByte4_GrSLType: return "ubyte4"; - case kTexture2D_GrSLType: - return "texture2D"; - case kSampler_GrSLType: - return "sampler"; } SK_ABORT("Unknown shader var type."); return ""; // suppress warning diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp index c4611a8bd2..3af61d0111 100644 --- a/src/gpu/vk/GrVkUniformHandler.cpp +++ b/src/gpu/vk/GrVkUniformHandler.cpp @@ -79,8 +79,6 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) { case kTexture2DSampler_GrSLType: case kTextureExternalSampler_GrSLType: case kTexture2DRectSampler_GrSLType: - case kTexture2D_GrSLType: - case kSampler_GrSLType: break; } SK_ABORT("Unexpected type"); @@ -163,8 +161,6 @@ static inline uint32_t grsltype_to_vk_size(GrSLType type) { case kTexture2DSampler_GrSLType: case kTextureExternalSampler_GrSLType: case kTexture2DRectSampler_GrSLType: - case kTexture2D_GrSLType: - case kSampler_GrSLType: break; } SK_ABORT("Unexpected type"); diff --git a/src/gpu/vk/GrVkVaryingHandler.cpp b/src/gpu/vk/GrVkVaryingHandler.cpp index 2f7bb5bc04..5686f3e7a4 100644 --- a/src/gpu/vk/GrVkVaryingHandler.cpp +++ b/src/gpu/vk/GrVkVaryingHandler.cpp @@ -70,10 +70,6 @@ static inline int grsltype_to_location_size(GrSLType type) { case kUShort_GrSLType: case kUByte_GrSLType: return 1; - case kTexture2D_GrSLType: - return 0; - case kSampler_GrSLType: - return 0; } SK_ABORT("Unexpected type"); return -1; |