From 1f92626c0bcd01ddcb6241936ce77157d51986e2 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 20 Apr 2023 14:03:19 -0400
Subject: [PATCH] zink: add z32s8 as mandatory GL3.0 profile attachment format

fixes #8616

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22608>
(cherry picked from commit 1bc9efc10c2329d6442f39115a1c013fd870f48d)
---
 .pick_status.json                                  | 2 +-
 src/gallium/drivers/zink/VP_ZINK_requirements.json | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 1eeb20ee6c8..2884d6c72ae 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -130,7 +130,7 @@
         "description": "zink: add z32s8 as mandatory GL3.0 profile attachment format",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/VP_ZINK_requirements.json b/src/gallium/drivers/zink/VP_ZINK_requirements.json
index a75557bf49f..ca6995a009f 100644
--- a/src/gallium/drivers/zink/VP_ZINK_requirements.json
+++ b/src/gallium/drivers/zink/VP_ZINK_requirements.json
@@ -100,6 +100,15 @@
                 "VkPhysicalDeviceConditionalRenderingFeaturesEXT": {
                     "conditionalRendering": true
                 }
+            },
+            "formats": {
+                "VK_FORMAT_D32_SFLOAT_S8_UINT": {
+                    "VkFormatProperties": {
+                        "optimalTilingFeatures": [
+                            "VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT"
+                        ]
+                    }
+                }
             }
         },
         "gl31_baseline": {