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

Minor and forgotten stuff

Browse Source
This commit is contained in:
Lynix
2020-03-26 21:20:00 +01:00
parent 1dc0ed8e94
commit 15b95ca4a1
7 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/Core/PluginManager.cpp
View File

@@ -113,7 +113,7 @@ namespace Nz
}
std::filesystem::path path = pluginPath;
if (appendExtension && path.extension() == NAZARA_DYNLIB_EXTENSION)
if (appendExtension && path.extension() != NAZARA_DYNLIB_EXTENSION)
path += NAZARA_DYNLIB_EXTENSION;
bool exists = false;
@@ -159,7 +159,7 @@ namespace Nz
return false;
}
std::filesystem::path canonicalPath = std::filesystem::canonical(pluginPath);
std::filesystem::path canonicalPath = std::filesystem::canonical(path);
s_plugins[canonicalPath] = std::move(library);
return true;

7
src/Nazara/VulkanRenderer/VulkanRenderer.cpp
View File

@@ -10,6 +10,7 @@
#include <Nazara/VulkanRenderer/VkRenderWindow.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
#include <cassert>
#include <sstream>
#include <Nazara/VulkanRenderer/Debug.hpp>
namespace Nz
@@ -53,12 +54,12 @@ namespace Nz
return RenderAPI::Vulkan;
}
String VulkanRenderer::QueryAPIString() const
std::string VulkanRenderer::QueryAPIString() const
{
StringStream ss;
std::ostringstream ss;
ss << "Vulkan renderer " << VK_VERSION_MAJOR(APIVersion) << '.' << VK_VERSION_MINOR(APIVersion) << '.' << VK_VERSION_PATCH(APIVersion);
return ss;
return ss.str();
}
UInt32 VulkanRenderer::QueryAPIVersion() const