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

src/gpu/vk/GrVkRenderTarget.cpp

Index: src/gpu/vk/GrVkRenderTarget.cpp
diff --git a/src/gpu/vk/GrVkRenderTarget.cpp b/src/gpu/vk/GrVkRenderTarget.cpp
index dc966cab816413180ca10a3e381f014fc1b396c1..b86a640e3df4b04d76d16fd852276fe2d085f1eb 100644
--- a/src/gpu/vk/GrVkRenderTarget.cpp
+++ b/src/gpu/vk/GrVkRenderTarget.cpp
@@ -239,7 +239,7 @@ void GrVkRenderTarget::createFramebuffer(GrVkGpu* gpu) {
     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);
 }
 
@@ -253,13 +253,14 @@ void GrVkRenderTarget::getAttachmentsDescriptor(
     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);
@@ -284,11 +285,15 @@ GrVkRenderTarget::~GrVkRenderTarget() {
 
 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());