From 8f7b8929572da407240dbc0cb688a56c9c07c95e Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 27 Jul 2022 17:03:42 -0400
Subject: [PATCH] zink: allow sw loading with D3D_ALWAYS_SOFTWARE for nine

Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17775>
---
 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 6ae51cf45c5..0db129a22a0 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1323,7 +1323,8 @@ choose_pdev(struct zink_screen *screen)
    assert(pdev_count > 0);
 
    VkPhysicalDeviceProperties props;
-   bool cpu = debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false);
+   bool cpu = debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false) ||
+              debug_get_bool_option("D3D_ALWAYS_SOFTWARE", false);
    /* priority when multiple drivers are available (highest to lowest):
       VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU
       VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU