Vulkan: Always use LOAD for RenderPass attachments.

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -191,18 +191,18 @@ gl::Error ContextVk::setupDraw(const gl::Context *context,
     Serial queueSerial           = mRenderer->getCurrentQueueSerial();
     uint32_t maxAttrib           = programGL->getState().getMaxActiveAttribLocation();
 
-    vk::CommandGraphNode *renderNode = nullptr;
-    ANGLE_TRY(vkFBO->getRenderNode(context, &renderNode));
+    vk::CommandGraphNode *graphNode = nullptr;
+    ANGLE_TRY(vkFBO->getCommandGraphNodeForDraw(context, &graphNode));
 
-    if (!renderNode->getInsideRenderPassCommands()->valid())
+    if (!graphNode->getInsideRenderPassCommands()->valid())
     {
         mVertexArrayDirty = true;
         mTexturesDirty    = true;
-        ANGLE_TRY(renderNode->beginInsideRenderPassRecording(mRenderer, commandBuffer));
+        ANGLE_TRY(graphNode->beginInsideRenderPassRecording(mRenderer, commandBuffer));
     }
     else
     {
-        *commandBuffer = renderNode->getInsideRenderPassCommands();
+        *commandBuffer = graphNode->getInsideRenderPassCommands();
     }
 
     // Ensure any writes to the VAO buffers are flushed before we read from them.
@@ -210,7 +210,7 @@ gl::Error ContextVk::setupDraw(const gl::Context *context,
     {
 
         mVertexArrayDirty = false;
-        vkVAO->updateDrawDependencies(renderNode, programGL->getActiveAttribLocationsMask(),
+        vkVAO->updateDrawDependencies(graphNode, programGL->getActiveAttribLocationsMask(),
                                       elementArrayBufferOverride, queueSerial, drawType);
     }
 
@@ -234,7 +234,7 @@ gl::Error ContextVk::setupDraw(const gl::Context *context,
             ASSERT(texture);
 
             TextureVk *textureVk = vk::GetImpl(texture);
-            textureVk->onReadResource(renderNode, mRenderer->getCurrentQueueSerial());
+            textureVk->onReadResource(graphNode, mRenderer->getCurrentQueueSerial());
         }
     }
 

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -467,7 +467,8 @@ gl::Error FramebufferVk::getSamplePosition(size_t index, GLfloat *xy) const
     return gl::InternalError() << "getSamplePosition is unimplemented.";
 }
 
-gl::Error FramebufferVk::getRenderNode(const gl::Context *context, vk::CommandGraphNode **nodeOut)
+gl::Error FramebufferVk::getCommandGraphNodeForDraw(const gl::Context *context,
+                                                    vk::CommandGraphNode **nodeOut)
 {
     ContextVk *contextVk = vk::GetImpl(context);
     RendererVk *renderer = contextVk->getRenderer();
@@ -487,6 +488,10 @@ gl::Error FramebufferVk::getRenderNode(const gl::Context *context, vk::CommandGr
 
     std::vector<VkClearValue> attachmentClearValues;
 
+    vk::CommandBuffer *commandBuffer = nullptr;
+    ANGLE_TRY(node->beginOutsideRenderPassRecording(renderer->getDevice(),
+                                                    renderer->getCommandPool(), &commandBuffer));
+
     // Initialize RenderPass info.
     // TODO(jmadill): Could cache this info, would require dependent state change messaging.
     const auto &colorAttachments = mState.getColorAttachments();
@@ -498,8 +503,11 @@ gl::Error FramebufferVk::getRenderNode(const gl::Context *context, vk::CommandGr
             RenderTargetVk *renderTarget = nullptr;
             ANGLE_SWALLOW_ERR(colorAttachment.getRenderTarget(context, &renderTarget));
 
-            // TODO(jmadill): May need layout transition.
-            renderTarget->image->updateLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
+            // TODO(jmadill): Use automatic layout transition. http://anglebug.com/2361
+            renderTarget->image->changeLayoutWithStages(
+                VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
+                VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+                commandBuffer);
             node->appendColorRenderTarget(currentSerial, renderTarget);
             attachmentClearValues.emplace_back(contextVk->getClearColorValue());
         }
@@ -511,8 +519,15 @@ gl::Error FramebufferVk::getRenderNode(const gl::Context *context, vk::CommandGr
         RenderTargetVk *renderTarget = nullptr;
         ANGLE_SWALLOW_ERR(depthStencilAttachment->getRenderTarget(context, &renderTarget));
 
-        // TODO(jmadill): May need layout transition.
-        renderTarget->image->updateLayout(VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
+        // TODO(jmadill): Use automatic layout transition. http://anglebug.com/2361
+        const angle::Format &format    = renderTarget->format->textureFormat();
+        VkImageAspectFlags aspectFlags = (format.depthBits > 0 ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |
+                                         (format.stencilBits > 0 ? VK_IMAGE_ASPECT_STENCIL_BIT : 0);
+
+        renderTarget->image->changeLayoutWithStages(
+            aspectFlags, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
+            VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
+            commandBuffer);
         node->appendDepthStencilRenderTarget(currentSerial, renderTarget);
         attachmentClearValues.emplace_back(contextVk->getClearDepthStencilValue());
     }

src/libANGLE/renderer/vulkan/FramebufferVk.h

@@ -85,7 +85,8 @@ class FramebufferVk : public FramebufferImpl, public ResourceVk
     gl::Error getSamplePosition(size_t index, GLfloat *xy) const override;
 
     const vk::RenderPassDesc &getRenderPassDesc(const gl::Context *context);
-    gl::Error getRenderNode(const gl::Context *context, vk::CommandGraphNode **nodeOut);
+    gl::Error getCommandGraphNodeForDraw(const gl::Context *context,
+                                         vk::CommandGraphNode **nodeOut);
 
   private:
     FramebufferVk(const gl::FramebufferState &state);

src/libANGLE/renderer/vulkan/RenderbufferVk.cpp

@@ -127,6 +127,15 @@ gl::Error RenderbufferVk::setStorage(const gl::Context *context,
         viewInfo.subresourceRange.layerCount     = 1;
 
         ANGLE_TRY(mImageView.init(device, viewInfo));
+
+        // TODO(jmadill): Fold this into the RenderPass load/store ops. http://anglebug.com/2361
+        vk::CommandBuffer *commandBuffer = nullptr;
+        ANGLE_TRY(beginWriteResource(renderer, &commandBuffer));
+        VkClearColorValue black = {{0}};
+        mImage.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(mImage, black);
     }
 
     return gl::NoError();

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -139,6 +139,15 @@ gl::Error TextureVk::setImage(const gl::Context *context,
         viewInfo.subresourceRange.layerCount     = 1;
 
         ANGLE_TRY(mImageView.init(device, viewInfo));
+
+        // TODO(jmadill): Fold this into the RenderPass load/store ops. http://anglebug.com/2361
+        vk::CommandBuffer *commandBuffer = nullptr;
+        ANGLE_TRY(beginWriteResource(renderer, &commandBuffer));
+        VkClearColorValue black = {{0}};
+        mImage.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(mImage, black);
     }
 
     if (!mSampler.valid())

src/libANGLE/renderer/vulkan/vk_cache_utils.cpp

@@ -698,15 +698,17 @@ PackedAttachmentOpsDesc &AttachmentOpsArray::operator[](size_t index)
     return mOps[index];
 }
 
-void AttachmentOpsArray::initDummyOp(size_t index, VkImageLayout finalLayout)
+void AttachmentOpsArray::initDummyOp(size_t index,
+                                     VkImageLayout initialLayout,
+                                     VkImageLayout finalLayout)
 {
     PackedAttachmentOpsDesc &ops = mOps[index];
 
-    ops.loadOp         = VK_ATTACHMENT_LOAD_OP_CLEAR;
+    ops.loadOp         = VK_ATTACHMENT_LOAD_OP_LOAD;
     ops.storeOp        = VK_ATTACHMENT_STORE_OP_STORE;
     ops.stencilLoadOp  = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
     ops.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-    ops.initialLayout  = static_cast<uint16_t>(VK_IMAGE_LAYOUT_UNDEFINED);
+    ops.initialLayout  = static_cast<uint16_t>(initialLayout);
     ops.finalLayout    = static_cast<uint16_t>(finalLayout);
 }
 
@@ -765,12 +767,14 @@ vk::Error RenderPassCache::getCompatibleRenderPass(VkDevice device,
     vk::AttachmentOpsArray ops;
     for (uint32_t colorIndex = 0; colorIndex < desc.colorAttachmentCount(); ++colorIndex)
     {
-        ops.initDummyOp(colorIndex, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
+        ops.initDummyOp(colorIndex, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
+                        VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
     }
 
     if (desc.depthStencilAttachmentCount() > 0)
     {
         ops.initDummyOp(desc.colorAttachmentCount(),
+                        VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
                         VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
     }
 

src/libANGLE/renderer/vulkan/vk_cache_utils.h

@@ -103,7 +103,7 @@ class AttachmentOpsArray final
     PackedAttachmentOpsDesc &operator[](size_t index);
 
     // Initializes an attachment op with whatever values. Used for compatible RenderPass checks.
-    void initDummyOp(size_t index, VkImageLayout finalLayout);
+    void initDummyOp(size_t index, VkImageLayout initialLayout, VkImageLayout finalLayout);
 
     size_t hash() const;