| Index: src/gpu/glsl/GrGLSL.h
|
| diff --git a/src/gpu/glsl/GrGLSL.h b/src/gpu/glsl/GrGLSL.h
|
| index 9f5f2b05b4178744087a1bb51d3a161d2c7889be..844b7c76db9ba65eb067ac487f96a4968a65f419 100644
|
| --- a/src/gpu/glsl/GrGLSL.h
|
| +++ b/src/gpu/glsl/GrGLSL.h
|
| @@ -58,7 +58,7 @@ bool GrGLSLSupportsNamedFragmentShaderOutputs(GrGLSLGeneration);
|
| */
|
| inline const char* GrGLSLTexture2DFunctionName(GrSLType coordType, GrSLType samplerType,
|
| GrGLSLGeneration glslGen) {
|
| - SkASSERT(GrSLTypeIsSamplerType(samplerType));
|
| + SkASSERT(GrSLTypeIs2DTextureType(samplerType));
|
| SkASSERT(kVec2f_GrSLType == coordType || kVec3f_GrSLType == coordType);
|
| // GL_TEXTURE_RECTANGLE_ARB is written against OpenGL 2.0/GLSL 1.10. At that time there were
|
| // separate texture*() functions. In OpenGL 3.0/GLSL 1.30 the different texture*() functions
|
| @@ -127,6 +127,8 @@ static inline const char* GrGLSLTypeString(GrSLType t) {
|
| return "samplerExternalOES";
|
| case kSampler2DRect_GrSLType:
|
| return "sampler2DRect";
|
| + case kSamplerBuffer_GrSLType:
|
| + return "samplerBuffer";
|
| case kBool_GrSLType:
|
| return "bool";
|
| case kInt_GrSLType:
|
|
|