From: Jesse Natalie <jenatali@microsoft.com>
Date: Mon, 29 Aug 2022 19:59:52 +0000 (-0700)
Subject: dzn: Use architecture props to return correct device type
X-Git-Tag: upstream/22.3.5~1396
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd653ee33ff75dc8a3e70c12875379877220a0d5;p=platform%2Fupstream%2Fmesa.git

dzn: Use architecture props to return correct device type

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18306>
---

diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c
index 6790e1d..b1b2b35 100644
--- a/src/microsoft/vulkan/dzn_device.c
+++ b/src/microsoft/vulkan/dzn_device.c
@@ -1566,13 +1566,7 @@ dzn_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
    VkPhysicalDeviceType devtype = VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU;
    if (pdevice->desc.is_warp)
       devtype = VK_PHYSICAL_DEVICE_TYPE_CPU;
-   else if (false) { // TODO: detect discreete GPUs
-      /* This is a tad tricky to get right, because we need to have the
-       * actual ID3D12Device before we can query the
-       * D3D12_FEATURE_DATA_ARCHITECTURE structure... So for now, let's
-       * just pretend everything is integrated, because... well, that's
-       * what I have at hand right now ;)
-       */
+   else if (!pdevice->architecture.UMA) {
       devtype = VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU;
    }