| Index: src/gpu/vk/GrVkResourceProvider.cpp
|
| diff --git a/src/gpu/vk/GrVkResourceProvider.cpp b/src/gpu/vk/GrVkResourceProvider.cpp
|
| index b1817cf3ea2e7ba1b626bdfb4fe71ab9a71986a4..90293286c300d5c9b5effbdc8c7a165f4246f9bd 100644
|
| --- a/src/gpu/vk/GrVkResourceProvider.cpp
|
| +++ b/src/gpu/vk/GrVkResourceProvider.cpp
|
| @@ -130,7 +130,6 @@ GrVkResourceProvider::findRenderPass(const CompatibleRPHandle& compatibleHandle,
|
| CompatibleRenderPassSet& compatibleSet = fRenderPassArray[compatibleHandle.toIndex()];
|
| const GrVkRenderPass* renderPass = compatibleSet.getRenderPass(fGpu,
|
| colorOps,
|
| - resolveOps,
|
| stencilOps);
|
| renderPass->ref();
|
| return renderPass;
|
| @@ -401,17 +400,16 @@ bool GrVkResourceProvider::CompatibleRenderPassSet::isCompatible(
|
| GrVkRenderPass* GrVkResourceProvider::CompatibleRenderPassSet::getRenderPass(
|
| const GrVkGpu* gpu,
|
| const GrVkRenderPass::LoadStoreOps& colorOps,
|
| - const GrVkRenderPass::LoadStoreOps& resolveOps,
|
| const GrVkRenderPass::LoadStoreOps& stencilOps) {
|
| for (int i = 0; i < fRenderPasses.count(); ++i) {
|
| int idx = (i + fLastReturnedIndex) % fRenderPasses.count();
|
| - if (fRenderPasses[idx]->equalLoadStoreOps(colorOps, resolveOps, stencilOps)) {
|
| + if (fRenderPasses[idx]->equalLoadStoreOps(colorOps, stencilOps)) {
|
| fLastReturnedIndex = idx;
|
| return fRenderPasses[idx];
|
| }
|
| }
|
| GrVkRenderPass* renderPass = fRenderPasses.emplace_back(new GrVkRenderPass());
|
| - renderPass->init(gpu, *this->getCompatibleRenderPass(), colorOps, resolveOps, stencilOps);
|
| + renderPass->init(gpu, *this->getCompatibleRenderPass(), colorOps, stencilOps);
|
| fLastReturnedIndex = fRenderPasses.count() - 1;
|
| return renderPass;
|
| }
|
|
|