From 42fba6eee4deff7f52ae07a07cd735c345fb793c Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 19 May 2016 09:04:29 +0200 Subject: [PATCH] Vulkan/Device: Improve and rename GetDeviceQueue method Former-commit-id: 7887f86989e9f19f315275bcb944147bca306afd --- include/Nazara/Vulkan/VkDevice.hpp | 2 +- include/Nazara/Vulkan/VkDevice.inl | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/Nazara/Vulkan/VkDevice.hpp b/include/Nazara/Vulkan/VkDevice.hpp index 084aaa2f0..8f915e965 100644 --- a/include/Nazara/Vulkan/VkDevice.hpp +++ b/include/Nazara/Vulkan/VkDevice.hpp @@ -34,7 +34,7 @@ namespace Nz bool Create(VkPhysicalDevice device, const VkDeviceCreateInfo& createInfo, const VkAllocationCallbacks* allocator = nullptr); inline void Destroy(); - inline void GetDeviceQueue(UInt32 queueFamilyIndex, UInt32 queueIndex, VkQueue* queue); + inline VkQueue GetQueue(UInt32 queueFamilyIndex, UInt32 queueIndex); inline Instance& GetInstance(); inline const Instance& GetInstance() const; inline VkResult GetLastErrorCode() const; diff --git a/include/Nazara/Vulkan/VkDevice.inl b/include/Nazara/Vulkan/VkDevice.inl index e837f67f6..471107c84 100644 --- a/include/Nazara/Vulkan/VkDevice.inl +++ b/include/Nazara/Vulkan/VkDevice.inl @@ -31,9 +31,12 @@ namespace Nz } } - inline void Device::GetDeviceQueue(UInt32 queueFamilyIndex, UInt32 queueIndex, VkQueue* queue) + inline VkQueue Device::GetQueue(UInt32 queueFamilyIndex, UInt32 queueIndex) { - return vkGetDeviceQueue(m_device, queueFamilyIndex, queueIndex, queue); + VkQueue queue; + vkGetDeviceQueue(m_device, queueFamilyIndex, queueIndex, &queue); + + return queue; } inline Instance& Device::GetInstance()