diff options
Diffstat (limited to 'src/gpu/gl/GrGLUniformHandler.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLUniformHandler.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGLUniformHandler.cpp b/src/gpu/gl/GrGLUniformHandler.cpp index 81b1ee69ac..0d57a1422c 100644 --- a/src/gpu/gl/GrGLUniformHandler.cpp +++ b/src/gpu/gl/GrGLUniformHandler.cpp @@ -63,7 +63,7 @@ GrGLSLUniformHandler::UniformHandle GrGLUniformHandler::internalAddUniformArray( GrGLSLUniformHandler::SamplerHandle GrGLUniformHandler::addSampler(uint32_t visibility, GrSwizzle swizzle, - GrSLType type, + GrTextureType type, GrSLPrecision precision, const char* name) { SkASSERT(name && strlen(name)); @@ -74,8 +74,7 @@ GrGLSLUniformHandler::SamplerHandle GrGLUniformHandler::addSampler(uint32_t visi fProgramBuilder->nameVariable(&mangleName, prefix, name, true); UniformInfo& sampler = fSamplers.push_back(); - SkASSERT(GrSLTypeIsCombinedSamplerType(type)); - sampler.fVariable.setType(type); + sampler.fVariable.setType(GrSLCombinedSamplerTypeForTextureType(type)); sampler.fVariable.setTypeModifier(GrShaderVar::kUniform_TypeModifier); sampler.fVariable.setPrecision(precision); sampler.fVariable.setName(mangleName); |