mirror/vk-bootstrap
1
0
Fork 0
mirror of https://github.com/charles-lunarg/vk-bootstrap.git synced 2024-11-22 15:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Cody Goodson 2021-06-07 17:06:21 -05:00 committed by Charles Giessen
parent f49032f804
commit f955777c8a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/VkBootstrap.cpp
View File

@ -1351,7 +1351,6 @@ detail::Result<uint32_t> Device::get_dedicated_queue_index(QueueType type) const
detail::Result<VkQueue> Device::get_queue(QueueType type) const { detail::Result<VkQueue> Device::get_queue(QueueType type) const {
auto index = get_queue_index(type); auto index = get_queue_index(type);
if (!index.has_value()) return { index.error() }; if (!index.has_value()) return { index.error() };
//return detail::get_queue(device, index.value());
VkQueue out_queue; VkQueue out_queue;
internal_table.fp_vkGetDeviceQueue(device, index.value(), 0, &out_queue); internal_table.fp_vkGetDeviceQueue(device, index.value(), 0, &out_queue);
return out_queue; return out_queue;
@ -1472,10 +1471,12 @@ detail::Result<Device> DeviceBuilder::build() const {
device.queue_families = physical_device.queue_families; device.queue_families = physical_device.queue_families;
device.allocation_callbacks = info.allocation_callbacks; device.allocation_callbacks = info.allocation_callbacks;
device.fp_vkGetDeviceProcAddr = detail::vulkan_functions().fp_vkGetDeviceProcAddr; device.fp_vkGetDeviceProcAddr = detail::vulkan_functions().fp_vkGetDeviceProcAddr;
device.internal_table.fp_vkGetDeviceQueue = detail::vulkan_functions().get_device_proc_addr(device.device,
reinterpret_cast<PFN_vkGetDeviceQueue>(device.fp_vkGetDeviceProcAddr(device.device, "vkGetDeviceProcAddr")); device.internal_table.fp_vkGetDeviceQueue,
device.internal_table.fp_vkDestroyDevice = "vkGetDeviceQueue");
reinterpret_cast<PFN_vkDestroyDevice>(device.fp_vkGetDeviceProcAddr(device.device, "vkDestroyDevice")); detail::vulkan_functions().get_device_proc_addr(device.device,
device.internal_table.fp_vkDestroyDevice,
"vkDestroyDevice");
return device; return device;
} }
DeviceBuilder& DeviceBuilder::custom_queue_setup(std::vector<CustomQueueDescription> queue_descriptions) { DeviceBuilder& DeviceBuilder::custom_queue_setup(std::vector<CustomQueueDescription> queue_descriptions) {