Index: src/gpu/glsl/GrGLSL.h |
diff --git a/src/gpu/glsl/GrGLSL.h b/src/gpu/glsl/GrGLSL.h |
index 12c1f1fcc6b375e35a677757f28adf76d0a4662a..1f71ac354652fac3867aab628327ffd4a9fc4b34 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 |
@@ -110,6 +110,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: |