commit efb5a5c8f0bda71c6a5fc3ae131d00bc2b2a171a
author Jamie Madill <jmadill@chromium.org> Mon Jan 29 15:56:59 2018 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Jan 30 14:38:08 2018 +0000
tree 4c678991372ccc571db6932724f1983db2b21a2f
parent 5dd4ad896bcb69b7e3747c1a17e6b07da63753e8

Vulkan: Fix swaps done right after a clear.

We were missing a dependency insertion between the Framebuffer and
its attachments, only during clear operations. Also renames a few
methods to make them more consistent.

Bug: angleproject:2264
Change-Id: Ic3af5b34b6de900ea2cc1b765f8d3d69f7f9a131
Reviewed-on: https://chromium-review.googlesource.com/891985
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
index e96dfe2..e4c12d2 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -155,6 +155,8 @@
     vk::CommandBuffer *commandBuffer = nullptr;
     ANGLE_TRY(recordWriteCommands(renderer, &commandBuffer));
 
+    Serial currentSerial = renderer->getCurrentQueueSerial();
+
     for (const auto &colorAttachment : mState.getColorAttachments())
     {
         if (colorAttachment.isAttached())
@@ -162,6 +164,8 @@
             RenderTargetVk *renderTarget = nullptr;
             ANGLE_TRY(colorAttachment.getRenderTarget(context, &renderTarget));
 
+            renderTarget->resource->setWriteNode(getCurrentWriteNode(currentSerial), currentSerial);
+
             renderTarget->image->changeLayoutWithStages(
                 VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
                 VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, commandBuffer);
@@ -170,6 +174,8 @@
         }
     }
 
+    // TODO(jmadill): Depth/stencil clear.
+
     return gl::NoError();
 }