diff options
author | 2016-10-03 15:06:07 -0400 | |
---|---|---|
committer | 2016-10-03 20:46:56 +0000 | |
commit | d368211a2a98125ba0dc29ce8bcaf28bfc65c358 (patch) | |
tree | 63558de940e52809a72c18c2f6a16befab75b711 | |
parent | 0d9dfe981e2a620bd867efbad195856937657a4b (diff) |
Remove unused resolve parameters for vulkan render passes
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2874
Change-Id: Ie8ad608c02e824ba5af2a81ada724dca22ac92e5
Reviewed-on: https://skia-review.googlesource.com/2874
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
-rw-r--r-- | src/gpu/vk/GrVkCopyManager.cpp | 4 | ||||
-rw-r--r-- | src/gpu/vk/GrVkGpuCommandBuffer.cpp | 13 | ||||
-rw-r--r-- | src/gpu/vk/GrVkResourceProvider.cpp | 4 | ||||
-rw-r--r-- | src/gpu/vk/GrVkResourceProvider.h | 2 |
4 files changed, 1 insertions, 22 deletions
diff --git a/src/gpu/vk/GrVkCopyManager.cpp b/src/gpu/vk/GrVkCopyManager.cpp index 293863d002..68f7c317d1 100644 --- a/src/gpu/vk/GrVkCopyManager.cpp +++ b/src/gpu/vk/GrVkCopyManager.cpp @@ -294,20 +294,16 @@ bool GrVkCopyManager::copySurfaceAsDraw(GrVkGpu* gpu, VK_ATTACHMENT_STORE_OP_STORE); GrVkRenderPass::LoadStoreOps vkStencilOps(VK_ATTACHMENT_LOAD_OP_DONT_CARE, VK_ATTACHMENT_STORE_OP_STORE); - GrVkRenderPass::LoadStoreOps vkResolveOps(VK_ATTACHMENT_LOAD_OP_DONT_CARE, - VK_ATTACHMENT_STORE_OP_STORE); const GrVkRenderPass* renderPass; const GrVkResourceProvider::CompatibleRPHandle& rpHandle = rt->compatibleRenderPassHandle(); if (rpHandle.isValid()) { renderPass = gpu->resourceProvider().findRenderPass(rpHandle, vkColorOps, - vkResolveOps, vkStencilOps); } else { renderPass = gpu->resourceProvider().findRenderPass(*rt, vkColorOps, - vkResolveOps, vkStencilOps); } diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp index 3ae54251b6..e0cfce3dc2 100644 --- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp +++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp @@ -68,19 +68,14 @@ GrVkGpuCommandBuffer::GrVkGpuCommandBuffer(GrVkGpu* gpu, get_vk_load_store_ops(stencilInfo, &vkLoadOp, &vkStoreOp); GrVkRenderPass::LoadStoreOps vkStencilOps(vkLoadOp, vkStoreOp); - GrVkRenderPass::LoadStoreOps vkResolveOps(VK_ATTACHMENT_LOAD_OP_LOAD, - VK_ATTACHMENT_STORE_OP_STORE); - const GrVkResourceProvider::CompatibleRPHandle& rpHandle = target->compatibleRenderPassHandle(); if (rpHandle.isValid()) { fRenderPass = fGpu->resourceProvider().findRenderPass(rpHandle, vkColorOps, - vkResolveOps, vkStencilOps); } else { fRenderPass = fGpu->resourceProvider().findRenderPass(*target, vkColorOps, - vkResolveOps, vkStencilOps); } @@ -148,8 +143,6 @@ void GrVkGpuCommandBuffer::discard(GrRenderTarget* target) { VK_ATTACHMENT_STORE_OP_STORE); GrVkRenderPass::LoadStoreOps vkStencilOps(VK_ATTACHMENT_LOAD_OP_DONT_CARE, VK_ATTACHMENT_STORE_OP_STORE); - GrVkRenderPass::LoadStoreOps vkResolveOps(VK_ATTACHMENT_LOAD_OP_DONT_CARE, - VK_ATTACHMENT_STORE_OP_STORE); const GrVkRenderPass* oldRP = fRenderPass; @@ -159,12 +152,10 @@ void GrVkGpuCommandBuffer::discard(GrRenderTarget* target) { if (rpHandle.isValid()) { fRenderPass = fGpu->resourceProvider().findRenderPass(rpHandle, vkColorOps, - vkResolveOps, vkStencilOps); } else { fRenderPass = fGpu->resourceProvider().findRenderPass(*vkRT, vkColorOps, - vkResolveOps, vkStencilOps); } @@ -245,8 +236,6 @@ void GrVkGpuCommandBuffer::onClear(GrRenderTarget* target, const GrFixedClip& cl VK_ATTACHMENT_STORE_OP_STORE); GrVkRenderPass::LoadStoreOps vkStencilOps(VK_ATTACHMENT_LOAD_OP_LOAD, VK_ATTACHMENT_STORE_OP_STORE); - GrVkRenderPass::LoadStoreOps vkResolveOps(VK_ATTACHMENT_LOAD_OP_LOAD, - VK_ATTACHMENT_STORE_OP_STORE); const GrVkRenderPass* oldRP = fRenderPass; @@ -255,12 +244,10 @@ void GrVkGpuCommandBuffer::onClear(GrRenderTarget* target, const GrFixedClip& cl if (rpHandle.isValid()) { fRenderPass = fGpu->resourceProvider().findRenderPass(rpHandle, vkColorOps, - vkResolveOps, vkStencilOps); } else { fRenderPass = fGpu->resourceProvider().findRenderPass(*vkRT, vkColorOps, - vkResolveOps, vkStencilOps); } diff --git a/src/gpu/vk/GrVkResourceProvider.cpp b/src/gpu/vk/GrVkResourceProvider.cpp index a7f07b0230..3027c2d349 100644 --- a/src/gpu/vk/GrVkResourceProvider.cpp +++ b/src/gpu/vk/GrVkResourceProvider.cpp @@ -131,7 +131,6 @@ GrVkResourceProvider::findCompatibleRenderPass(const CompatibleRPHandle& compati const GrVkRenderPass* GrVkResourceProvider::findRenderPass( const GrVkRenderTarget& target, const GrVkRenderPass::LoadStoreOps& colorOps, - const GrVkRenderPass::LoadStoreOps& resolveOps, const GrVkRenderPass::LoadStoreOps& stencilOps, CompatibleRPHandle* compatibleHandle) { GrVkResourceProvider::CompatibleRPHandle tempRPHandle; @@ -142,13 +141,12 @@ const GrVkRenderPass* GrVkResourceProvider::findRenderPass( // This will get us the handle to (and possible create) the compatible set for the specific // GrVkRenderPass we are looking for. this->findCompatibleRenderPass(target, compatibleHandle); - return this->findRenderPass(*pRPHandle, colorOps, resolveOps, stencilOps); + return this->findRenderPass(*pRPHandle, colorOps, stencilOps); } const GrVkRenderPass* GrVkResourceProvider::findRenderPass(const CompatibleRPHandle& compatibleHandle, const GrVkRenderPass::LoadStoreOps& colorOps, - const GrVkRenderPass::LoadStoreOps& resolveOps, const GrVkRenderPass::LoadStoreOps& stencilOps) { SkASSERT(compatibleHandle.isValid() && compatibleHandle.toIndex() < fRenderPassArray.count()); CompatibleRenderPassSet& compatibleSet = fRenderPassArray[compatibleHandle.toIndex()]; diff --git a/src/gpu/vk/GrVkResourceProvider.h b/src/gpu/vk/GrVkResourceProvider.h index b9e98e72cc..8200123e25 100644 --- a/src/gpu/vk/GrVkResourceProvider.h +++ b/src/gpu/vk/GrVkResourceProvider.h @@ -73,7 +73,6 @@ public: // return a GrVkRenderPasses without the need inspecting a GrVkRenderTarget. const GrVkRenderPass* findRenderPass(const GrVkRenderTarget& target, const GrVkRenderPass::LoadStoreOps& colorOps, - const GrVkRenderPass::LoadStoreOps& resolveOps, const GrVkRenderPass::LoadStoreOps& stencilOps, CompatibleRPHandle* compatibleHandle = nullptr); @@ -81,7 +80,6 @@ public: // findCompatibleRenderPass. const GrVkRenderPass* findRenderPass(const CompatibleRPHandle& compatibleHandle, const GrVkRenderPass::LoadStoreOps& colorOps, - const GrVkRenderPass::LoadStoreOps& resolveOps, const GrVkRenderPass::LoadStoreOps& stencilOps); GrVkPrimaryCommandBuffer* findOrCreatePrimaryCommandBuffer(); |