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

Author: Erik Faye-Lund <[email protected]>
Date:   Tue Aug  9 12:23:26 2022 +0200

zink: add have_D32_SFLOAT_S8_UINT boolean

This will be reused in the following commit.

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

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 2034dcd8522..f4f86799ee0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -58,7 +58,7 @@
         "description": "zink: add have_D32_SFLOAT_S8_UINT boolean",
         "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 66b2d83fadd..905359778ee 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1529,8 +1529,7 @@ zink_get_format(struct zink_screen *screen, enum 
pipe_format format)
 
    if (ret == VK_FORMAT_D24_UNORM_S8_UINT &&
        !screen->have_D24_UNORM_S8_UINT) {
-      assert(zink_is_depth_format_supported(screen,
-                                            VK_FORMAT_D32_SFLOAT_S8_UINT));
+      assert(screen->have_D32_SFLOAT_S8_UINT);
       return VK_FORMAT_D32_SFLOAT_S8_UINT;
    }
 
@@ -2195,6 +2194,8 @@ zink_internal_create_screen(const struct 
pipe_screen_config *config)
                                               VK_FORMAT_X8_D24_UNORM_PACK32);
    screen->have_D24_UNORM_S8_UINT = zink_is_depth_format_supported(screen,
                                               VK_FORMAT_D24_UNORM_S8_UINT);
+   screen->have_D32_SFLOAT_S8_UINT = zink_is_depth_format_supported(screen,
+                                              VK_FORMAT_D32_SFLOAT_S8_UINT);
 
    if (!zink_get_physical_device_info(screen)) {
       debug_printf("ZINK: failed to detect features\n");
diff --git a/src/gallium/drivers/zink/zink_screen.h 
b/src/gallium/drivers/zink/zink_screen.h
index eae5615c199..709d5f39b02 100644
--- a/src/gallium/drivers/zink/zink_screen.h
+++ b/src/gallium/drivers/zink/zink_screen.h
@@ -158,6 +158,7 @@ struct zink_screen {
 
    bool have_X8_D24_UNORM_PACK32;
    bool have_D24_UNORM_S8_UINT;
+   bool have_D32_SFLOAT_S8_UINT;
    bool have_triangle_fans;
    bool need_2D_zs;
    bool need_2D_sparse;

Reply via email to