The open source OpenXR runtime
vk: fix video encode queue index
Co-authored-by: Korcan Hussein <korcan.hussein@collabora.com>
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2584>
authored by
Patrick Nicolas
Korcan Hussein
and committed by
Korcan Hussein
4d8d91a4
620f3c7a
+6
-2
+6
-2
src/xrt/auxiliary/vk/vk_bundle_init.c
+6
-2
src/xrt/auxiliary/vk/vk_bundle_init.c
···
1296
1296
return VK_ERROR_NOT_PERMITTED_EXT;
1297
1297
}
1298
1298
1299
+
vk->main_queue = VK_BUNDLE_NULL_QUEUE;
1299
1300
if (only_compute) {
1300
1301
ret = find_queue_family(vk, VK_QUEUE_COMPUTE_BIT, &vk->main_queue.family_index);
1301
1302
} else {
···
1317
1318
uint32_t queue_create_info_count = 1;
1318
1319
1319
1320
// Compute or Graphics queue
1321
+
vk->main_queue.index = 0;
1320
1322
queue_create_info[0].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
1321
1323
queue_create_info[0].pNext = NULL;
1322
1324
queue_create_info[0].queueCount = 1;
···
1329
1331
if (u_string_list_contains(device_ext_list, VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME)) {
1330
1332
ret = find_queue_family(vk, VK_QUEUE_VIDEO_ENCODE_BIT_KHR, &vk->encode_queue.family_index);
1331
1333
if (ret == VK_SUCCESS) {
1334
+
vk->encode_queue.index = 0;
1332
1335
queue_create_info[queue_create_info_count].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
1333
1336
queue_create_info[queue_create_info_count].pNext = NULL;
1334
1337
queue_create_info[queue_create_info_count].queueCount = 1;
···
1510
1513
if (ret != VK_SUCCESS) {
1511
1514
goto err_destroy;
1512
1515
}
1513
-
vk->vkGetDeviceQueue(vk->device, vk->main_queue.family_index, 0, &vk->main_queue.queue);
1516
+
vk->vkGetDeviceQueue(vk->device, vk->main_queue.family_index, vk->main_queue.index, &vk->main_queue.queue);
1514
1517
#if defined(VK_KHR_video_encode_queue)
1515
1518
if (vk->encode_queue.family_index != VK_QUEUE_FAMILY_IGNORED) {
1516
-
vk->vkGetDeviceQueue(vk->device, vk->encode_queue.family_index, 0, &vk->encode_queue.queue);
1519
+
vk->vkGetDeviceQueue(vk->device, vk->encode_queue.family_index, vk->encode_queue.index,
1520
+
&vk->encode_queue.queue);
1517
1521
}
1518
1522
#endif
1519
1523