mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-26 17:37:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xrt: Use xrt_luid_t for deviceLUID

Browse source
This commit is contained in:
Jakob Bornecrantz 2022-05-04 13:31:59 +01:00 committed by Jakob Bornecrantz
parent b62d871498
commit 38f68dc104
5 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/xrt/compositor/main/comp_compositor.c
View file

@ -725,7 +725,7 @@ compositor_init_vulkan(struct comp_compositor *c)
static_assert(ARRAY_SIZE(vk_res.selected_gpu_deviceUUID.data) == XRT_UUID_SIZE, "array size mismatch");
static_assert(ARRAY_SIZE(vk_res.client_gpu_deviceUUID.data) == ARRAY_SIZE(c->settings.client_gpu_deviceUUID.data), "array size mismatch");
static_assert(ARRAY_SIZE(vk_res.selected_gpu_deviceUUID.data) == ARRAY_SIZE(c->settings.selected_gpu_deviceUUID.data), "array size mismatch");
static_assert(ARRAY_SIZE(vk_res.client_gpu_deviceLUID.data) == XRT_UUID_SIZE, "array size mismatch");
static_assert(ARRAY_SIZE(vk_res.client_gpu_deviceLUID.data) == XRT_LUID_SIZE, "array size mismatch");
static_assert(ARRAY_SIZE(vk_res.client_gpu_deviceLUID.data) == ARRAY_SIZE(c->settings.client_gpu_deviceLUID.data), "array size mismatch");
// clang-format on

2
src/xrt/compositor/main/comp_settings.h
View file

@ -119,7 +119,7 @@ struct comp_settings
xrt_uuid_t client_gpu_deviceUUID;
//! The Windows LUID for the GPU device suggested for D3D clients, never changes.
xrt_uuid_t client_gpu_deviceLUID;
xrt_luid_t client_gpu_deviceLUID;
//! Whether @ref client_d3d_deviceLUID is valid
bool client_gpu_deviceLUID_valid;

22
src/xrt/compositor/util/comp_vulkan.c
View file

@ -28,6 +28,14 @@
#define UUID_STR_SIZE (XRT_UUID_SIZE * 3 + 1)
static void
snprint_luid(char *str, size_t size, xrt_luid_t *luid)
{
for (size_t i = 0, offset = 0; i < ARRAY_SIZE(luid->data) && offset < size; i++, offset += 3) {
snprintf(str + offset, size - offset, "%02x ", luid->data[i]);
}
}
static void
snprint_uuid(char *str, size_t size, xrt_uuid_t *uuid)
{
@ -65,7 +73,7 @@ get_device_uuid(struct vk_bundle *vk, int gpu_index, xrt_uuid_t *uuid)
}
static bool
get_device_luid(struct vk_bundle *vk, int gpu_index, xrt_uuid_t *uuid)
get_device_luid(struct vk_bundle *vk, int gpu_index, xrt_luid_t *luid)
{
VkPhysicalDeviceIDProperties pdidp = {
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES,
@ -90,7 +98,7 @@ get_device_luid(struct vk_bundle *vk, int gpu_index, xrt_uuid_t *uuid)
if (pdidp.deviceLUIDValid != VK_TRUE) {
return false;
}
memcpy(uuid->data, pdidp.deviceLUID, ARRAY_SIZE(uuid->data));
memcpy(luid->data, pdidp.deviceLUID, ARRAY_SIZE(luid->data));
return true;
}
@ -124,16 +132,16 @@ fill_in_results(struct vk_bundle *vk, const struct comp_vulkan_arguments *vk_arg
// Store physical device UUID suggested to clients in settings
if (vk_res->client_gpu_index >= 0) {
if (get_device_uuid(vk, vk_res->client_gpu_index, &vk_res->client_gpu_deviceUUID)) {
char uuid_str[UUID_STR_SIZE] = {0};
snprint_uuid(uuid_str, ARRAY_SIZE(uuid_str), &vk_res->client_gpu_deviceUUID);
char buffer[UUID_STR_SIZE] = {0};
snprint_uuid(buffer, ARRAY_SIZE(buffer), &vk_res->client_gpu_deviceUUID);
// Trailing space above, means 'to' should be right next to '%s'.
VK_DEBUG(vk, "Suggest %d with uuid: %sto clients", vk_res->client_gpu_index, uuid_str);
VK_DEBUG(vk, "Suggest %d with uuid: %sto clients", vk_res->client_gpu_index, buffer);
if (get_device_luid(vk, vk_res->client_gpu_index, &vk_res->client_gpu_deviceLUID)) {
vk_res->client_gpu_deviceLUID_valid = true;
snprint_uuid(uuid_str, ARRAY_SIZE(uuid_str), &vk_res->client_gpu_deviceLUID);
VK_DEBUG(vk, " Device LUID: %s", uuid_str);
snprint_luid(buffer, ARRAY_SIZE(buffer), &vk_res->client_gpu_deviceLUID);
VK_DEBUG(vk, "\tDevice LUID: %s", buffer);
}
} else {
VK_ERROR(vk, "Failed to get device %d uuid", vk_res->client_gpu_index);

2
src/xrt/compositor/util/comp_vulkan.h
View file

@ -77,7 +77,7 @@ struct comp_vulkan_results
xrt_uuid_t client_gpu_deviceUUID;
//! The (Windows) LUID for the GPU device suggested for clients.
xrt_uuid_t client_gpu_deviceLUID;
xrt_luid_t client_gpu_deviceLUID;
//! Whether @ref client_gpu_deviceLUID is valid (probably only on Windows)
bool client_gpu_deviceLUID_valid;

2
src/xrt/include/xrt/xrt_compositor.h
View file

@ -1758,7 +1758,7 @@ struct xrt_system_compositor_info
xrt_uuid_t client_vk_deviceUUID;
//! The (Windows) LUID for the GPU device suggested for D3D clients, never changes.
xrt_uuid_t client_d3d_deviceLUID;
xrt_luid_t client_d3d_deviceLUID;
//! Whether @ref client_d3d_deviceLUID is valid
bool client_d3d_deviceLUID_valid;