Module: Mesa
Branch: main
Commit: 3340dea1941885e85087bd35b6261dfee8148722
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3340dea1941885e85087bd35b6261dfee8148722

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>

---

 src/gallium/drivers/zink/zink_screen.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c 
b/src/gallium/drivers/zink/zink_screen.c
index c1a9b95fac2..a4deb00635b 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1517,7 +1517,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