Vulkan: Depth / stencil attachments bug fixes

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -143,8 +143,9 @@ gl::Error FramebufferVk::clear(const gl::Context *context, GLbitfield mask)
         // We only support packed depth/stencil, not separate.
         ASSERT(!(clearDepth && clearStencil) || mState.getDepthStencilAttachment());
 
-        const VkImageAspectFlags aspectFlags = (clearDepth ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |
-                                               (clearDepth ? VK_IMAGE_ASPECT_STENCIL_BIT : 0);
+        const VkImageAspectFlags aspectFlags =
+            (depthAttachment ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |
+            (stencilAttachment ? VK_IMAGE_ASPECT_STENCIL_BIT : 0);
 
         RenderTargetVk *renderTarget = mRenderTargetCache.getDepthStencil();
         renderTarget->resource->onWriteResource(writingNode, currentSerial);

src/libANGLE/renderer/vulkan/RenderbufferVk.cpp

@@ -16,6 +16,13 @@
 namespace rx
 {
 
+namespace
+{
+constexpr VkClearDepthStencilValue kDefaultClearDepthStencilValue = {0.0f, 1};
+constexpr VkClearColorValue kBlackClearColorValue                 = {{0}};
+
+}  // anonymous namespace
+
 RenderbufferVk::RenderbufferVk(const gl::RenderbufferState &state)
     : RenderbufferImpl(state), mAllocatedMemorySize(0)
 {
@@ -77,9 +84,13 @@ gl::Error RenderbufferVk::setStorage(const gl::Context *context,
 
     if (!mImage.valid() && (width != 0 || height != 0))
     {
+        const angle::Format &textureFormat = vkFormat.textureFormat();
+        bool isDepthOrStencilFormat = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0;
         const VkImageUsageFlags usage =
-            (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT |
-             VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT);
+            VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
+            VK_IMAGE_USAGE_SAMPLED_BIT |
+            (textureFormat.redBits > 0 ? VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT : 0) |
+            (isDepthOrStencilFormat ? VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT : 0);
 
         VkImageCreateInfo imageInfo;
         imageInfo.sType                 = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
@@ -106,7 +117,10 @@ gl::Error RenderbufferVk::setStorage(const gl::Context *context,
         ANGLE_TRY(vk::AllocateImageMemory(renderer, flags, &mImage, &mDeviceMemory,
                                           &mAllocatedMemorySize));
 
-        VkImageAspectFlags aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+        VkImageAspectFlags aspect =
+            (textureFormat.depthBits > 0 ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |
+            (textureFormat.stencilBits > 0 ? VK_IMAGE_ASPECT_STENCIL_BIT : 0) |
+            (textureFormat.redBits > 0 ? VK_IMAGE_ASPECT_COLOR_BIT : 0);
 
         // Allocate ImageView.
         VkImageViewCreateInfo viewInfo;
@@ -131,11 +145,19 @@ gl::Error RenderbufferVk::setStorage(const gl::Context *context,
         // 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);
+        mImage.changeLayoutWithStages(aspect, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+                                      VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
+                                      VK_PIPELINE_STAGE_TRANSFER_BIT, commandBuffer);
+
+        if (isDepthOrStencilFormat)
+        {
+            commandBuffer->clearSingleDepthStencilImage(mImage, aspect,
+                                                        kDefaultClearDepthStencilValue);
+        }
+        else
+        {
+            commandBuffer->clearSingleColorImage(mImage, kBlackClearColorValue);
+        }
     }
 
     return gl::NoError();