commit 47c8ea3fb265682b6dd040bf04488747f0292da1
author Jamie Madill <jmadill@chromium.org> Wed Jan 03 18:27:59 2018 -0500
committer Commit Bot <commit-bot@chromium.org> Thu Jan 04 00:27:55 2018 +0000
tree 92c5819dee02292e4f305dbae6fb5bd4b59f4374
parent 6df487ef1e6164bbe3fd05d74396edcf0001d25c

Vulkan: Fix looped clears.

These were broken by command re-ordering. The first problem was that
the Framebuffer RenderNode was not correctly being flagged as dirty.
This is fixed by keeping a serial instead of a bool to track the
RenderNode's cleanliness. The second issue was that an image layout
transition was being set with incorrect bits. Fix this by using the
correct access mask.

This fixes angle_perftests's Vulkan render test.

Bug: angleproject:2264
Bug: chromium:798866
Change-Id: I268b0f7aeb2c5e22892f6ef59dec62391b30bfb4
Reviewed-on: https://chromium-review.googlesource.com/848539
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 636825b..f0a325a 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -61,7 +61,7 @@
       mBackbuffer(nullptr),
       mRenderPassDesc(),
       mFramebuffer(),
-      mRenderNodeDirty(false)
+      mLastRenderNodeSerial()
 {
 }
 
@@ -70,7 +70,7 @@
       mBackbuffer(backbuffer),
       mRenderPassDesc(),
       mFramebuffer(),
-      mRenderNodeDirty(false)
+      mLastRenderNodeSerial()
 {
 }
 
@@ -161,8 +161,11 @@
         {
             RenderTargetVk *renderTarget = nullptr;
             ANGLE_TRY(colorAttachment.getRenderTarget(context, &renderTarget));
-            renderTarget->image->changeLayoutTop(
-                VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, commandBuffer);
+
+            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);
+
             commandBuffer->clearSingleColorImage(*renderTarget->image, clearColorValue);
         }
     }
@@ -348,7 +351,7 @@
     renderer->releaseResource(*this, &mFramebuffer);
 
     // Trigger a new set of secondary commands next time we render to this FBO,.
-    mRenderNodeDirty = true;
+    mLastRenderNodeSerial = Serial();
 
     // TODO(jmadill): Use pipeline cache.
     contextVk->invalidateCurrentPipeline();
@@ -471,7 +474,7 @@
     RendererVk *renderer = contextVk->getRenderer();
     Serial currentSerial = renderer->getCurrentQueueSerial();
 
-    if (isCurrentlyRecording(currentSerial) && !mRenderNodeDirty)
+    if (isCurrentlyRecording(currentSerial) && mLastRenderNodeSerial == currentSerial)
     {
         *nodeOut = getCurrentWriteNode(currentSerial);
         ASSERT((*nodeOut)->getInsideRenderPassCommands()->valid());
@@ -527,7 +530,7 @@
         node->appendDepthStencilRenderTarget(currentSerial, renderTarget);
     }
 
-    mRenderNodeDirty = false;
+    mLastRenderNodeSerial = currentSerial;
 
     *nodeOut = node;
     return gl::NoError();