Mesa (staging/22.1): vulkan/util: Fill VkPhysicalDeviceIDProperties::deviceNodeMask

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: cc7bef362813fb521bcd329e3d300bc142b4d07e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc7bef362813fb521bcd329e3d300bc142b4d07e

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Fri Apr 22 05:23:16 2022 -0700

vulkan/util: Fill VkPhysicalDeviceIDProperties::deviceNodeMask

This field copy was missing in
vk_get_physical_device_core_1_1_property_ext().

Fixes: 19ff5019b75 ("vulkan: Add helpers for filling exts for core features and properties.")
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16926>
(cherry picked from commit b78d3ebe722dac1c0093ff8f040f1443ffd02c49)

---

 .pick_status.json              | 2 +-
 src/vulkan/runtime/vk_device.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 666cdce6898..2ff22f5eee0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -877,7 +877,7 @@
         "description": "vulkan/util: Fill VkPhysicalDeviceIDProperties::deviceNodeMask",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "19ff5019b7551ef401db26da48d0199c1c88c1ca"
     },
diff --git a/src/vulkan/runtime/vk_device.c b/src/vulkan/runtime/vk_device.c
index a9c19154533..359862cff61 100644
--- a/src/vulkan/runtime/vk_device.c
+++ b/src/vulkan/runtime/vk_device.c
@@ -797,6 +797,7 @@ vk_get_physical_device_core_1_1_property_ext(struct VkBaseOutStructure *ext,
       CORE_PROPERTY(deviceUUID);
       CORE_PROPERTY(driverUUID);
       CORE_PROPERTY(deviceLUID);
+      CORE_PROPERTY(deviceNodeMask);
       CORE_PROPERTY(deviceLUIDValid);
       return true;
    }