Module: Mesa
Branch: staging/22.2
Commit: f330229d98db7a8089fa1daa9e2760f600084120
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f330229d98db7a8089fa1daa9e2760f600084120

Author: Erik Faye-Lund <[email protected]>
Date:   Mon Aug  8 16:10:54 2022 +0200

zink: do not use VK_FORMAT_D32_SFLOAT_S8_UINT without checking

Without this, we might end up trying to use VK_FORMAT_D32_SFLOAT_S8_UINT
even when it's not supported...

Cc: mesa-stable
Reviewed-by: Mike Blumenkrantz <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17953>
(cherry picked from commit 3340dea1941885e85087bd35b6261dfee8148722)

---

 .pick_status.json                      | 2 +-
 src/gallium/drivers/zink/zink_screen.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index f4f86799ee0..df972dd5900 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -49,7 +49,7 @@
         "description": "zink: do not use VK_FORMAT_D32_SFLOAT_S8_UINT without 
checking",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_screen.c 
b/src/gallium/drivers/zink/zink_screen.c
index 905359778ee..c9b98d6a9df 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1513,7 +1513,8 @@ zink_get_format(struct zink_screen *screen, enum 
pipe_format format)
 {
    VkFormat ret = zink_pipe_format_to_vk_format(emulate_x8(format));
 
-   if (format == PIPE_FORMAT_X32_S8X24_UINT)
+   if (format == PIPE_FORMAT_X32_S8X24_UINT &&
+       screen->have_D32_SFLOAT_S8_UINT)
       return VK_FORMAT_D32_SFLOAT_S8_UINT;
 
    if (format == PIPE_FORMAT_X24S8_UINT)

Reply via email to