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