From a442f67d2f35c1b18668e06172d49d1087cf8346 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Tue, 20 Aug 2024 12:24:23 -0400
Subject: [PATCH] zink: bail on choose_pdev immediately if no devices are
 available

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30746>
---
 src/gallium/drivers/zink/zink_screen.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 6c53c16da2e..759ab0922e3 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1717,7 +1717,8 @@ choose_pdev(struct zink_screen *screen, int64_t dev_major, int64_t dev_minor)
          return;
       }
 
-      assert(pdev_count > 0);
+      if (!pdev_count)
+         return;
 
       pdevs = malloc(sizeof(*pdevs) * pdev_count);
       if (!pdevs) {
@@ -1753,6 +1754,8 @@ choose_pdev(struct zink_screen *screen, int64_t dev_major, int64_t dev_minor)
             mesa_loge("ZINK: vkEnumeratePhysicalDevices failed (%s)", vk_Result_to_str(result));
          return;
       }
+      if (!pdev_count)
+         return;
       screen->pdev = pdev;
    }
    VKSCR(GetPhysicalDeviceProperties)(screen->pdev, &screen->info.props);