commit dc22d6b3ab121569a95300ac7ce66679c2cfd927
author Sagar Ghuge <sagar.ghuge@intel.com> Wed Mar 18 16:10:39 2020 -0700
committer Marge Bot <eric+marge@anholt.net> Thu Oct 22 21:42:36 2020 +0000
tree f7f107267755f9e0257a06fff2d86c4f7bbd029e
parent 993a2a71224e2063a111ecc1448788dddee0fc75

anv: Pass correct stencil aux usage during MSAA resolve

Signed-off-by: Sagar Ghuge <sagar.ghuge@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2942>

src/intel/vulkan/genX_cmd_buffer.c

diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 70e0ed2..6fb09bb 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -5834,7 +5834,10 @@
          dst_state->current_stencil_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
 
          enum isl_aux_usage src_aux_usage = ISL_AUX_USAGE_NONE;
-         enum isl_aux_usage dst_aux_usage = ISL_AUX_USAGE_NONE;
+         uint32_t plane = anv_image_aspect_to_plane(dst_iview->image->aspects,
+                                                    VK_IMAGE_ASPECT_STENCIL_BIT);
+         enum isl_aux_usage dst_aux_usage =
+            dst_iview->image->planes[plane].aux_usage;
 
          enum blorp_filter filter =
             vk_to_blorp_resolve_mode(subpass->stencil_resolve_mode);