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

Minor fixes + update vulkan include

Browse Source
This commit is contained in:
Lynix
2020-02-23 01:28:16 +01:00
parent 8be2342f25
commit 0c008236ba
28 changed files with 12325 additions and 6130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/Nazara/VulkanRenderer/Wrapper/Device.hpp
View File

@@ -9,6 +9,7 @@
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/HandledObject.hpp>
#include <Nazara/Core/ObjectHandle.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
#include <vulkan/vulkan.h>
@@ -19,8 +20,8 @@ namespace Nz
namespace Vk
{
class Device;
class Queue;
class Instance;
class Queue;
using DeviceHandle = ObjectHandle<Device>;
@@ -42,7 +43,7 @@ namespace Nz
inline const std::vector<QueueFamilyInfo>& GetEnabledQueues() const;
inline const QueueList& GetEnabledQueues(UInt32 familyQueue) const;
inline Queue GetQueue(UInt32 queueFamilyIndex, UInt32 queueIndex);
Queue GetQueue(UInt32 queueFamilyIndex, UInt32 queueIndex);
inline Instance& GetInstance();
inline const Instance& GetInstance() const;
inline VkResult GetLastErrorCode() const;

9
include/Nazara/VulkanRenderer/Wrapper/Device.inl
View File

@@ -6,7 +6,6 @@
#include <Nazara/Core/Error.hpp>
#include <Nazara/VulkanRenderer/Utils.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Queue.hpp>
#include <Nazara/VulkanRenderer/Debug.hpp>
namespace Nz
@@ -49,14 +48,6 @@ namespace Nz
return *m_queuesByFamily[familyQueue];
}
inline Queue Device::GetQueue(UInt32 queueFamilyIndex, UInt32 queueIndex)
{
VkQueue queue;
vkGetDeviceQueue(m_device, queueFamilyIndex, queueIndex, &queue);
return Queue(CreateHandle(), queue);
}
inline Instance& Device::GetInstance()
{
return m_instance;

1
include/Nazara/VulkanRenderer/Wrapper/Queue.inl
View File

@@ -5,7 +5,6 @@
#include <Nazara/VulkanRenderer/Wrapper/Queue.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/VulkanRenderer/Utils.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
#include <Nazara/VulkanRenderer/Debug.hpp>
namespace Nz