From 00269c09d690a97d663ea2b1e6bab5967497aa23 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@collabora.com>
Date: Wed, 20 Jul 2022 13:32:28 -0500
Subject: [PATCH] vulkan: Depth/stencil isn't fragment output state but
 multisample is

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17696>
---
 src/vulkan/runtime/vk_graphics_state.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/vulkan/runtime/vk_graphics_state.c b/src/vulkan/runtime/vk_graphics_state.c
index 053d2e3e833..86b1b7d8b99 100644
--- a/src/vulkan/runtime/vk_graphics_state.c
+++ b/src/vulkan/runtime/vk_graphics_state.c
@@ -1180,12 +1180,10 @@ vk_graphics_pipeline_state_fill(const struct vk_device *device,
    }
 
    if (lib & VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_OUTPUT_INTERFACE_BIT_EXT) {
-      if (rp.attachment_aspects & (VK_IMAGE_ASPECT_DEPTH_BIT |
-                                   VK_IMAGE_ASPECT_STENCIL_BIT))
-         needs |= MESA_VK_GRAPHICS_STATE_DEPTH_STENCIL_BIT;
-
       if (rp.attachment_aspects & (VK_IMAGE_ASPECT_COLOR_BIT))
          needs |= MESA_VK_GRAPHICS_STATE_COLOR_BLEND_BIT;
+
+      needs |= MESA_VK_GRAPHICS_STATE_MULTISAMPLE_BIT;
    }
 
    /*