AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused kBufferSampler_GrSLType

Browse Source 
Change-Id: I3e0476d92dfde928ef7d49155afdc3685c4ca03e
Reviewed-on: https://skia-review.googlesource.com/144023
Auto-Submit: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Brian Salomon 2018-07-27 12:05:21 -04:00 committed by Skia Commit-Bot
parent 49d14e98fe
commit db10ed097f
5 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/private/GrTypesPriv.h
View File

@ -328,7 +328,6 @@ enum GrSLType {
kTexture2DSampler_GrSLType,
kTextureExternalSampler_GrSLType,
kTexture2DRectSampler_GrSLType,
kBufferSampler_GrSLType,
kTexture2D_GrSLType,
kSampler_GrSLType,
};
@ -395,7 +394,6 @@ static inline bool GrSLTypeIsFloatType(GrSLType type) {
case kTexture2DSampler_GrSLType:
case kTextureExternalSampler_GrSLType:
case kTexture2DRectSampler_GrSLType:
case kBufferSampler_GrSLType:
case kBool_GrSLType:
case kByte_GrSLType:
case kByte2_GrSLType:
@ -479,7 +477,6 @@ static inline int GrSLTypeVecLength(GrSLType type) {
case kTexture2DSampler_GrSLType:
case kTextureExternalSampler_GrSLType:
case kTexture2DRectSampler_GrSLType:
case kBufferSampler_GrSLType:
case kTexture2D_GrSLType:
case kSampler_GrSLType:
return -1;
@ -516,7 +513,6 @@ static inline bool GrSLTypeIs2DCombinedSamplerType(GrSLType type) {
case kInt4_GrSLType:
case kUint_GrSLType:
case kUint2_GrSLType:
case kBufferSampler_GrSLType:
case kBool_GrSLType:
case kByte_GrSLType:
case kByte2_GrSLType:
@ -547,7 +543,6 @@ static inline bool GrSLTypeIsCombinedSamplerType(GrSLType type) {
case kTexture2DSampler_GrSLType:
case kTextureExternalSampler_GrSLType:
case kTexture2DRectSampler_GrSLType:
case kBufferSampler_GrSLType:
return true;
case kVoid_GrSLType:
@ -601,7 +596,6 @@ static inline bool GrSLTypeAcceptsPrecision(GrSLType type) {
case kTexture2DSampler_GrSLType:
case kTextureExternalSampler_GrSLType:
case kTexture2DRectSampler_GrSLType:
case kBufferSampler_GrSLType:
case kTexture2D_GrSLType:
case kSampler_GrSLType:
return true;
@ -679,7 +673,6 @@ static inline bool GrSLTypeTemporarilyAcceptsPrecision(GrSLType type) {
case kTexture2DSampler_GrSLType:
case kTextureExternalSampler_GrSLType:
case kTexture2DRectSampler_GrSLType:
case kBufferSampler_GrSLType:
case kTexture2D_GrSLType:
case kSampler_GrSLType:
return true;

4
src/gpu/GrProgramDesc.cpp
View File

@ -34,10 +34,6 @@ static inline uint16_t image_storage_or_sampler_uniform_type_key(GrSLType type )
case kTexture2DRectSampler_GrSLType:
value = 2;
break;
case kBufferSampler_GrSLType:
value = 3;
break;
default:
break;
}

2
src/gpu/glsl/GrGLSL.cpp
View File

@ -54,8 +54,6 @@ const char* GrGLSLTypeString(const GrShaderCaps* shaderCaps, GrSLType t) {
return "samplerExternalOES";
case kTexture2DRectSampler_GrSLType:
return "sampler2DRect";
case kBufferSampler_GrSLType:
return "samplerBuffer";
case kBool_GrSLType:
return "bool";
case kInt_GrSLType:

2
src/gpu/vk/GrVkUniformHandler.cpp
View File

@ -79,7 +79,6 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) {
case kTexture2DSampler_GrSLType:
case kTextureExternalSampler_GrSLType:
case kTexture2DRectSampler_GrSLType:
case kBufferSampler_GrSLType:
case kTexture2D_GrSLType:
case kSampler_GrSLType:
break;
@ -164,7 +163,6 @@ static inline uint32_t grsltype_to_vk_size(GrSLType type) {
case kTexture2DSampler_GrSLType:
case kTextureExternalSampler_GrSLType:
case kTexture2DRectSampler_GrSLType:
case kBufferSampler_GrSLType:
case kTexture2D_GrSLType:
case kSampler_GrSLType:
break;

2
src/gpu/vk/GrVkVaryingHandler.cpp
View File

@ -60,8 +60,6 @@ static inline int grsltype_to_location_size(GrSLType type) {
return 0;
case kTexture2DRectSampler_GrSLType:
return 0;
case kBufferSampler_GrSLType:
return 0;
case kBool_GrSLType:
return 1;
case kInt_GrSLType: // fall through