| Index: src/gpu/vk/GrVkProgramBuilder.cpp
|
| diff --git a/src/gpu/vk/GrVkProgramBuilder.cpp b/src/gpu/vk/GrVkProgramBuilder.cpp
|
| index 916b8c3b5f92546a846153e9ab954d7ee5720187..06de3a04f6443013692ef4e1b838f4eb6b30343c 100644
|
| --- a/src/gpu/vk/GrVkProgramBuilder.cpp
|
| +++ b/src/gpu/vk/GrVkProgramBuilder.cpp
|
| @@ -22,9 +22,7 @@ GrVkProgram* GrVkProgramBuilder::CreateProgram(GrVkGpu* gpu,
|
| GrGLSLExpr4 inputColor;
|
| GrGLSLExpr4 inputCoverage;
|
|
|
| - if (!builder.emitAndInstallProcs(&inputColor,
|
| - &inputCoverage,
|
| - gpu->vkCaps().maxSampledTextures())) {
|
| + if (!builder.emitAndInstallProcs(&inputColor, &inputCoverage)) {
|
| builder.cleanupFragmentProcessors();
|
| return nullptr;
|
| }
|
| @@ -50,21 +48,6 @@ void GrVkProgramBuilder::finalizeFragmentOutputColor(GrGLSLShaderVar& outputColo
|
| outputColor.setLayoutQualifier("location = 0");
|
| }
|
|
|
| -void GrVkProgramBuilder::emitSamplers(const GrProcessor& processor,
|
| - GrGLSLTextureSampler::TextureSamplerArray* outSamplers) {
|
| - int numTextures = processor.numTextures();
|
| - UniformHandle* localSamplerUniforms = fSamplerUniforms.push_back_n(numTextures);
|
| - SkString name;
|
| - for (int t = 0; t < numTextures; ++t) {
|
| - name.printf("%d", t);
|
| - localSamplerUniforms[t] =
|
| - fUniformHandler.addUniform(kFragment_GrShaderFlag,
|
| - kSampler2D_GrSLType, kDefault_GrSLPrecision,
|
| - name.c_str());
|
| - outSamplers->emplace_back(localSamplerUniforms[t], processor.textureAccess(t));
|
| - }
|
| -}
|
| -
|
| VkShaderStageFlags visibility_to_vk_stage_flags(uint32_t visibility) {
|
| VkShaderStageFlags flags = 0;
|
|
|
|
|