Don't add the resolve attachment to vulkan render passes.

src/gpu/vk/GrVkRenderTarget.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrVkRenderTarget.h"
 
 #include "GrRenderTargetPriv.h"
@@ skipping 221 matching lines @@
 
     // Vulkan requires us to create a compatible renderpass before we can create our framebuffer,
     // so we use this to get a (cached) basic renderpass, only for creation.
     fCachedSimpleRenderPass =
         gpu->resourceProvider().findCompatibleRenderPass(*this, &fCompatibleRPHandle);
 
     // Stencil attachment view is stored in the base RT stencil attachment
     const GrVkImageView* stencilView = this->stencilAttachmentView();
     fFramebuffer = GrVkFramebuffer::Create(gpu, this->width(), this->height(),
                                            fCachedSimpleRenderPass, fColorAttachmentView,
-                                           fResolveAttachmentView, stencilView);
+                                           nullptr, stencilView);

[jvanverth1, 2016/08/26 15:03:19]

This is the only place we use Framebuffer::Create(). Can we get rid of this
param?

[egdaniel, 2016/08/26 15:48:45]

So in my head I was thinking we should save this code, and similar parts below,
for once we start doing resolves at the end of render passes. However, as I
think about it, I don't want to do that until we do the whole render target,
framebuffer split/refactorization in Ganesh as a whole. And at that point this
code is going to look different anyways. So I'll delete all this then and in
rest of code

     SkASSERT(fFramebuffer);
 }
 
 void GrVkRenderTarget::getAttachmentsDescriptor(
                                            GrVkRenderPass::AttachmentsDescriptor* desc,
                                            GrVkRenderPass::AttachmentFlags* attachmentFlags) const {
     int colorSamples = this->numColorSamples();
     VkFormat colorFormat;
     GrPixelConfigToVkFormat(this->config(), &colorFormat);
     desc->fColor.fFormat = colorFormat;
     desc->fColor.fSamples = colorSamples ? colorSamples : 1;
     *attachmentFlags = GrVkRenderPass::kColor_AttachmentFlag;
     uint32_t attachmentCount = 1;
+#if 0 // We don't currently attach the resolve to the framebuffer since we manually do all resolving
     if (colorSamples > 0) {

[jvanverth1, 2016/08/26 15:03:19]

Do we need this code?

[egdaniel, 2016/08/26 15:48:45]

Done.

         desc->fResolve.fFormat = colorFormat;
         desc->fResolve.fSamples = 1;
         *attachmentFlags |= GrVkRenderPass::kResolve_AttachmentFlag;
         ++attachmentCount;
     }
-
+#endif
     const GrStencilAttachment* stencil = this->renderTargetPriv().getStencilAttachment();
     if (stencil) {
         const GrVkStencilAttachment* vkStencil = static_cast<const GrVkStencilAttachment*>(stencil);
         desc->fStencil.fFormat = vkStencil->vkFormat();
         desc->fStencil.fSamples = vkStencil->numSamples() ? vkStencil->numSamples() : 1;
         // Currently in vulkan stencil and color attachments must all have same number of samples
         SkASSERT(desc->fColor.fSamples == desc->fStencil.fSamples);
         *attachmentFlags |= GrVkRenderPass::kStencil_AttachmentFlag;
         ++attachmentCount;
     }
     desc->fAttachmentCount = attachmentCount;
 }
 
 GrVkRenderTarget::~GrVkRenderTarget() {
     // either release or abandon should have been called by the owner of this object.
     SkASSERT(!fMSAAImage);
     SkASSERT(!fResolveAttachmentView);
     SkASSERT(!fColorAttachmentView);
     SkASSERT(!fFramebuffer);
     SkASSERT(!fCachedSimpleRenderPass);
 }
 
 void GrVkRenderTarget::addResources(GrVkCommandBuffer& commandBuffer) const {
     commandBuffer.addResource(this->framebuffer());
-    commandBuffer.addResource(this->resource());
     commandBuffer.addResource(this->colorAttachmentView());
     if (this->msaaImageResource()) {
         commandBuffer.addResource(this->msaaImageResource());
-        commandBuffer.addResource(this->resolveAttachmentView());
+        // Current we do not add the resolve the framebuffer so we don't need to track the resource
+        // here
+        // commandBuffer.addResource(this->resolveAttachmentView());

[jvanverth1, 2016/08/26 15:03:19]

Again, do we need this code?

[egdaniel, 2016/08/26 15:48:46]

Done.

+        // commandBuffer.addResource(this->resource());
+    } else {
+        commandBuffer.addResource(this->resource());
     }
     if (this->stencilImageResource()) {
         commandBuffer.addResource(this->stencilImageResource());
         commandBuffer.addResource(this->stencilAttachmentView());
     }
 }
 
 void GrVkRenderTarget::releaseInternalObjects() {
     GrVkGpu* gpu = this->getVkGpu();
 
@@ skipping 80 matching lines @@
     }
 
     return nullptr;
 }
 
 
 GrVkGpu* GrVkRenderTarget::getVkGpu() const {
     SkASSERT(!this->wasDestroyed());
     return static_cast<GrVkGpu*>(this->getGpu());
 }