summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@collabora.com>2022-04-22 05:23:16 -0700
committerDylan Baker <dylan.c.baker@intel.com>2022-06-15 16:13:00 -0700
commitd5a5bcbd54dd594e933c3ae66b5824f4a2c4919b (patch)
tree8822beff334ca2ca3d3821a98688ad5c8729c511
parentdfd2cd3ebcf9a463ea2268386cc6970711ec3502 (diff)
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@collabora.com> Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Reviewed-by: Jesse Natalie <jenatali@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16926> (cherry picked from commit b78d3ebe722dac1c0093ff8f040f1443ffd02c49)
-rw-r--r--.pick_status.json2
-rw-r--r--src/vulkan/runtime/vk_device.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 613a21ae10d..3d2c2815e83 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;
}