From: Nanley Chery <nanley.g.chery@intel.com>
Date: Wed, 1 Feb 2017 03:01:18 +0000 (-0800)
Subject: anv/pass: Store the depth-stencil attachment's last subpass index
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=043d92fef9315dcc303f36d472eb38b5511bb2cd;p=mesa.git

anv/pass: Store the depth-stencil attachment's last subpass index

Commit 968ffd6c868af7226e8f889573eef709888151cb stored the last subpass
index of all the attachments but that of the depth-stencil attachment.
This could cause depth buffers used in multiple subpasses not to be in
the requested final layout. Fix this error.

Cc: "17.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
---

diff --git a/src/intel/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c
index 5df6330c6af..2df18260d3a 100644
--- a/src/intel/vulkan/anv_pass.c
+++ b/src/intel/vulkan/anv_pass.c
@@ -172,6 +172,7 @@ VkResult anv_CreateRenderPass(
             pass->attachments[a].usage |=
                VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
             pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_DRAW;
+            pass->attachments[a].last_subpass_idx = i;
          }
       } else {
          subpass->depth_stencil_attachment = VK_ATTACHMENT_UNUSED;