commit d368211a2a98125ba0dc29ce8bcaf28bfc65c358
author Greg Daniel <egdaniel@google.com> Mon Oct 03 15:06:07 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 03 20:46:56 2016 +0000
tree 63558de940e52809a72c18c2f6a16befab75b711
parent 0d9dfe981e2a620bd867efbad195856937657a4b

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>

src/gpu/vk/GrVkResourceProvider.cpp

diff --git a/src/gpu/vk/GrVkResourceProvider.cpp b/src/gpu/vk/GrVkResourceProvider.cpp
index a7f07b0..3027c2d 100644
--- a/src/gpu/vk/GrVkResourceProvider.cpp
+++ b/src/gpu/vk/GrVkResourceProvider.cpp
@@ -131,7 +131,6 @@
 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 @@
     // 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()];