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

Fix merge

Browse Source
This commit is contained in:
Lynix
2020-02-25 20:22:46 +01:00
parent cb66dddd45
commit 7bbba14ba0
10 changed files with 97 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/VulkanRenderer/Export.cpp
View File

@@ -9,7 +9,7 @@ extern "C"
{
NAZARA_EXPORT Nz::RendererImpl* NazaraRenderer_Instantiate()
{
std::unique_ptr<Nz::VulkanRenderer> renderer(new Nz::VulkanRenderer);
std::unique_ptr<Nz::VulkanRenderer> renderer = std::make_unique<Nz::VulkanRenderer>();
return renderer.release();
}
}

4
src/Nazara/VulkanRenderer/Wrapper/Device.cpp
View File

@@ -38,10 +38,10 @@ namespace Nz
// Parse extensions and layers
for (UInt32 i = 0; i < createInfo.enabledExtensionCount; ++i)
m_loadedExtensions.insert(createInfo.ppEnabledExtensionNames[i]);
m_loadedExtensions.emplace(createInfo.ppEnabledExtensionNames[i]);
for (UInt32 i = 0; i < createInfo.enabledLayerCount; ++i)
m_loadedLayers.insert(createInfo.ppEnabledLayerNames[i]);
m_loadedLayers.emplace(createInfo.ppEnabledLayerNames[i]);
// Load all device-related functions
#define NAZARA_VULKANRENDERER_LOAD_DEVICE(func) func = reinterpret_cast<PFN_##func>(GetProcAddr(#func))

1
src/Nazara/VulkanRenderer/Wrapper/Loader.cpp
View File

@@ -3,6 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/VulkanRenderer/Utils.hpp>
#include <Nazara/VulkanRenderer/Debug.hpp>