| Index: src/gpu/vk/GrVkCommandBuffer.cpp
|
| diff --git a/src/gpu/vk/GrVkCommandBuffer.cpp b/src/gpu/vk/GrVkCommandBuffer.cpp
|
| index c05e9555cb9f72e4ab1c529d27234d6e46e20b51..ea2b1bee0b376b06b37c8d9adc70e8607861c6c7 100644
|
| --- a/src/gpu/vk/GrVkCommandBuffer.cpp
|
| +++ b/src/gpu/vk/GrVkCommandBuffer.cpp
|
| @@ -12,7 +12,7 @@
|
| #include "GrVkPipeline.h"
|
| #include "GrVkRenderPass.h"
|
| #include "GrVkRenderTarget.h"
|
| -#include "GrVkProgram.h"
|
| +#include "GrVkPipelineState.h"
|
| #include "GrVkTransferBuffer.h"
|
| #include "GrVkUtil.h"
|
|
|
| @@ -347,7 +347,7 @@ void GrVkCommandBuffer::clearAttachments(const GrVkGpu* gpu,
|
| }
|
|
|
| void GrVkCommandBuffer::bindDescriptorSets(const GrVkGpu* gpu,
|
| - GrVkProgram* program,
|
| + GrVkPipelineState* pipelineState,
|
| VkPipelineLayout layout,
|
| uint32_t firstSet,
|
| uint32_t setCount,
|
| @@ -363,7 +363,7 @@ void GrVkCommandBuffer::bindDescriptorSets(const GrVkGpu* gpu,
|
| descriptorSets,
|
| dynamicOffsetCount,
|
| dynamicOffsets));
|
| - program->addUniformResources(*this);
|
| + pipelineState->addUniformResources(*this);
|
| }
|
|
|
| void GrVkCommandBuffer::bindPipeline(const GrVkGpu* gpu, const GrVkPipeline* pipeline) {
|
|
|