mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-15 11:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

a/vk: Add possibility to create video encode queue

Browse source
This commit is contained in:
Patrick Nicolas 2024-01-20 14:04:24 +01:00
parent c8195a8fbc
commit 11fc8d5629
2 changed files with 40 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/xrt/auxiliary/vk/vk_bundle_init.c
View file

@ -1145,13 +1145,32 @@ vk_create_device(struct vk_bundle *vk,
}; };
float queue_priority = 0.0f; float queue_priority = 0.0f;
VkDeviceQueueCreateInfo queue_create_info = { VkDeviceQueueCreateInfo queue_create_info[2] = {0};
.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, uint32_t queue_create_info_count = 1;
.pNext = NULL,
.queueCount = 1, // Compute or Graphics queue
.queueFamilyIndex = vk->queue_family_index, queue_create_info[0].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
.pQueuePriorities = &queue_priority, queue_create_info[0].pNext = NULL;
}; queue_create_info[0].queueCount = 1;
queue_create_info[0].queueFamilyIndex = vk->queue_family_index;
queue_create_info[0].pQueuePriorities = &queue_priority;
#ifdef VK_KHR_video_encode_queue
// Video encode queue
vk->encode_queue_family_index = VK_QUEUE_FAMILY_IGNORED;
if (u_string_list_contains(device_ext_list, VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME)) {
ret = find_queue_family(vk, VK_QUEUE_VIDEO_ENCODE_BIT_KHR, &vk->encode_queue_family_index);
if (ret == VK_SUCCESS) {
queue_create_info[queue_create_info_count].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queue_create_info[queue_create_info_count].pNext = NULL;
queue_create_info[queue_create_info_count].queueCount = 1;
queue_create_info[queue_create_info_count].queueFamilyIndex = vk->encode_queue_family_index;
queue_create_info[queue_create_info_count].pQueuePriorities = &queue_priority;
queue_create_info_count++;
VK_DEBUG(vk, "Creating video encode queue, family index %d", vk->encode_queue_family_index);
}
}
#endif
#ifdef VK_KHR_global_priority #ifdef VK_KHR_global_priority
static_assert(VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT == static_assert(VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT ==
@ -1161,8 +1180,8 @@ vk_create_device(struct vk_bundle *vk,
if (vk->has_EXT_global_priority || vk->has_KHR_global_priority) { if (vk->has_EXT_global_priority || vk->has_KHR_global_priority) {
// This is okay, see static_assert above. // This is okay, see static_assert above.
priority_info.pNext = queue_create_info.pNext; priority_info.pNext = queue_create_info[0].pNext;
queue_create_info.pNext = (void *)&priority_info; queue_create_info[0].pNext = (void *)&priority_info;
} }
@ -1193,8 +1212,8 @@ vk_create_device(struct vk_bundle *vk,
VkDeviceCreateInfo device_create_info = { VkDeviceCreateInfo device_create_info = {
.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
.queueCreateInfoCount = 1, .queueCreateInfoCount = queue_create_info_count,
.pQueueCreateInfos = &queue_create_info, .pQueueCreateInfos = queue_create_info,
.enabledExtensionCount = u_string_list_get_size(device_ext_list), .enabledExtensionCount = u_string_list_get_size(device_ext_list),
.ppEnabledExtensionNames = u_string_list_get_data(device_ext_list), .ppEnabledExtensionNames = u_string_list_get_data(device_ext_list),
.pEnabledFeatures = &enabled_features, .pEnabledFeatures = &enabled_features,
@ -1237,6 +1256,11 @@ vk_create_device(struct vk_bundle *vk,
goto err_destroy; goto err_destroy;
} }
vk->vkGetDeviceQueue(vk->device, vk->queue_family_index, 0, &vk->queue); vk->vkGetDeviceQueue(vk->device, vk->queue_family_index, 0, &vk->queue);
#if defined(VK_KHR_video_encode_queue)
if (vk->encode_queue_family_index != VK_QUEUE_FAMILY_IGNORED) {
vk->vkGetDeviceQueue(vk->device, vk->encode_queue_family_index, 0, &vk->encode_queue);
}
#endif
// Need to do this after functions have been gotten. // Need to do this after functions have been gotten.
VK_NAME_INSTANCE(vk, vk->instance, "vk_bundle instance"); VK_NAME_INSTANCE(vk, vk->instance, "vk_bundle instance");

5
src/xrt/auxiliary/vk/vk_helpers.h
View file

@ -57,6 +57,11 @@ struct vk_bundle
uint32_t queue_family_index; uint32_t queue_family_index;
uint32_t queue_index; uint32_t queue_index;
VkQueue queue; VkQueue queue;
#if defined(VK_KHR_video_encode_queue)
uint32_t encode_queue_family_index;
uint32_t encode_queue_index;
VkQueue encode_queue;
#endif
struct os_mutex queue_mutex; struct os_mutex queue_mutex;