diff options
Diffstat (limited to 'src/gpu/vk/GrVkPipelineState.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkPipelineState.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/vk/GrVkPipelineState.cpp index ba4f95f3e3..2ca1aafdd4 100644 --- a/src/gpu/vk/GrVkPipelineState.cpp +++ b/src/gpu/vk/GrVkPipelineState.cpp @@ -173,13 +173,14 @@ void GrVkPipelineState::abandonGPUResources() { } static void append_texture_bindings(const GrProcessor& processor, - SkTArray<const GrTextureAccess*>* textureBindings) { - if (int numTextures = processor.numTextures()) { - const GrTextureAccess** bindings = textureBindings->push_back_n(numTextures); + SkTArray<const GrProcessor::TextureSampler*>* textureBindings) { + if (int numTextureSamplers = processor.numTextureSamplers()) { + const GrProcessor::TextureSampler** bindings = + textureBindings->push_back_n(numTextureSamplers); int i = 0; do { - bindings[i] = &processor.textureAccess(i); - } while (++i < numTextures); + bindings[i] = &processor.textureSampler(i); + } while (++i < numTextureSamplers); } } @@ -192,7 +193,7 @@ void GrVkPipelineState::setData(GrVkGpu* gpu, this->setRenderTargetState(pipeline); - SkSTArray<8, const GrTextureAccess*> textureBindings; + SkSTArray<8, const GrProcessor::TextureSampler*> textureBindings; fGeometryProcessor->setData(fDataManager, primProc, GrFragmentProcessor::CoordTransformIter(pipeline)); @@ -302,9 +303,10 @@ void GrVkPipelineState::writeUniformBuffers(const GrVkGpu* gpu) { } } -void GrVkPipelineState::writeSamplers(GrVkGpu* gpu, - const SkTArray<const GrTextureAccess*>& textureBindings, - bool allowSRGBInputs) { +void GrVkPipelineState::writeSamplers( + GrVkGpu* gpu, + const SkTArray<const GrProcessor::TextureSampler*>& textureBindings, + bool allowSRGBInputs) { SkASSERT(fNumSamplers == textureBindings.count()); for (int i = 0; i < textureBindings.count(); ++i) { |