sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vulkan: Make device objects take a DeviceHandle at creation

Browse Source 
Former-commit-id: 0c9724fac593d562dd0ef6fbdf10b2cad9494ac7 [formerly 05c1e582989afde033ac6cee4def19859246167b]
Former-commit-id: 4730597d196d8841c395a1cfe101bca70caa4a5e
This commit is contained in:
Lynix
2016-06-13 19:53:46 +02:00
parent 8e9deee43e
commit 405e873294
12 changed files with 61 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Vulkan/VkDevice.inl
View File

@@ -14,7 +14,7 @@ namespace Nz
{
inline Device::Device(Instance& instance) :
m_instance(instance),
m_device(nullptr)
m_device(VK_NULL_HANDLE),
{
}
@@ -25,12 +25,12 @@ namespace Nz
inline void Device::Destroy()
{
if (m_device)
if (m_device != VK_NULL_HANDLE)
{
vkDeviceWaitIdle(m_device);
vkDestroyDevice(m_device, (m_allocator.pfnAllocation) ? &m_allocator : nullptr);
m_device = nullptr;
m_device = VK_NULL_HANDLE;
}
}
@@ -39,7 +39,7 @@ namespace Nz
VkQueue queue;
vkGetDeviceQueue(m_device, queueFamilyIndex, queueIndex, &queue);
return Queue(*this, queue);
return Queue(CreateHandle(), queue);
}
inline Instance& Device::GetInstance()