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

VulkanRenderer/DeviceMemory: Fix linking error 

Former-commit-id: 849e76f479aaf77646ae786584ac896838cc2f63 [formerly fcbd8bd667d6cfac01e01241bea06c43d34a1ad0] [formerly e042ac243512c07e9870213ec7d5a0e9ff7a4ba2 [formerly 378029f40ef5dee44eb29a73e3d39639bd91cee6]]
Former-commit-id: c284ca126ded4435adbe15ca2a3e619fa2e09e1a [formerly 69da980659df0005066ef6b21a181359d28b184b]
Former-commit-id: a989d3a678fd4c0ce1c23f54c5f3fda5fb175e2e
This commit is contained in:
Lynix 2016-09-15 00:44:40 +02:00
parent f709ca4997
commit 2c80b04691
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/VulkanRenderer/VkDeviceMemory.hpp
View File

@ -21,7 +21,7 @@ namespace Nz
public: public:
DeviceMemory(); DeviceMemory();
DeviceMemory(const DeviceMemory&) = delete; DeviceMemory(const DeviceMemory&) = delete;
DeviceMemory(DeviceMemory&& memory); inline DeviceMemory(DeviceMemory&& memory);
~DeviceMemory() = default; ~DeviceMemory() = default;
using DeviceObject::Create; using DeviceObject::Create;

2
include/Nazara/VulkanRenderer/VkDeviceMemory.inl
View File

@ -16,7 +16,7 @@ namespace Nz
{ {
} }
DeviceMemory::DeviceMemory(DeviceMemory&& memory) : inline DeviceMemory::DeviceMemory(DeviceMemory&& memory) :
DeviceObject(std::move(memory)) DeviceObject(std::move(memory))
{ {
m_mappedPtr = memory.m_mappedPtr; m_mappedPtr = memory.m_mappedPtr;

2
include/Nazara/VulkanRenderer/VkDeviceObject.hpp
View File

@ -21,7 +21,7 @@ namespace Nz
public: public:
inline DeviceObject(); inline DeviceObject();
DeviceObject(const DeviceObject&) = delete; DeviceObject(const DeviceObject&) = delete;
DeviceObject(DeviceObject&&); inline DeviceObject(DeviceObject&& object);
inline ~DeviceObject(); inline ~DeviceObject();
inline bool Create(const DeviceHandle& device, const CreateInfo& createInfo, const VkAllocationCallbacks* allocator = nullptr); inline bool Create(const DeviceHandle& device, const CreateInfo& createInfo, const VkAllocationCallbacks* allocator = nullptr);