From f955777c8a5d0ac87e57f2ceefca147c14835c9b Mon Sep 17 00:00:00 2001
From: Cody Goodson <accs@vibimanx.com>
Date: Mon, 7 Jun 2021 17:06:21 -0500
Subject: [PATCH] Cleanup

---
 src/VkBootstrap.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/VkBootstrap.cpp b/src/VkBootstrap.cpp
index 747fa9a..ac44672 100644
--- a/src/VkBootstrap.cpp
+++ b/src/VkBootstrap.cpp
@@ -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 {
 	auto index = get_queue_index(type);
 	if (!index.has_value()) return { index.error() };
-	//return detail::get_queue(device, index.value());
 	VkQueue out_queue;
 	internal_table.fp_vkGetDeviceQueue(device, index.value(), 0, &out_queue);
 	return out_queue;
@@ -1472,10 +1471,12 @@ detail::Result<Device> DeviceBuilder::build() const {
 	device.queue_families = physical_device.queue_families;
 	device.allocation_callbacks = info.allocation_callbacks;
 	device.fp_vkGetDeviceProcAddr = detail::vulkan_functions().fp_vkGetDeviceProcAddr;
-	device.internal_table.fp_vkGetDeviceQueue =
-			reinterpret_cast<PFN_vkGetDeviceQueue>(device.fp_vkGetDeviceProcAddr(device.device, "vkGetDeviceProcAddr"));
-	device.internal_table.fp_vkDestroyDevice =
-			reinterpret_cast<PFN_vkDestroyDevice>(device.fp_vkGetDeviceProcAddr(device.device, "vkDestroyDevice"));
+	detail::vulkan_functions().get_device_proc_addr(device.device,
+													device.internal_table.fp_vkGetDeviceQueue,
+													"vkGetDeviceQueue");
+	detail::vulkan_functions().get_device_proc_addr(device.device,
+													device.internal_table.fp_vkDestroyDevice,
+													"vkDestroyDevice");
 	return device;
 }
 DeviceBuilder& DeviceBuilder::custom_queue_setup(std::vector<CustomQueueDescription> queue_descriptions) {