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

Fix some compilation errors

This commit is contained in:
Lynix 2017-07-04 23:57:43 +02:00
parent 8cdd922177
commit 29cad19253
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Nazara/VulkanRenderer/Vulkan.cpp
View File

@ -62,16 +62,16 @@ namespace Nz
parameters.GetStringParameter("VkAppInfo_OverrideEngineName", &engineName); parameters.GetStringParameter("VkAppInfo_OverrideEngineName", &engineName);
bool bParam; bool bParam;
int iParam; long long iParam;
if (parameters.GetIntegerParameter("VkAppInfo_OverrideAPIVersion", &iParam)) if (parameters.GetIntegerParameter("VkAppInfo_OverrideAPIVersion", &iParam))
apiVersion = iParam; apiVersion = static_cast<UInt32>(iParam);
if (parameters.GetIntegerParameter("VkAppInfo_OverrideApplicationVersion", &iParam)) if (parameters.GetIntegerParameter("VkAppInfo_OverrideApplicationVersion", &iParam))
appVersion = iParam; appVersion = static_cast<UInt32>(iParam);
if (parameters.GetIntegerParameter("VkAppInfo_OverrideEngineVersion", &iParam)) if (parameters.GetIntegerParameter("VkAppInfo_OverrideEngineVersion", &iParam))
engineVersion = iParam; engineVersion = static_cast<UInt32>(iParam);
VkApplicationInfo appInfo = { VkApplicationInfo appInfo = {
VK_STRUCTURE_TYPE_APPLICATION_INFO, VK_STRUCTURE_TYPE_APPLICATION_INFO,
@ -100,7 +100,7 @@ namespace Nz
if (parameters.GetIntegerParameter("VkInstanceInfo_EnabledLayerCount", &iParam)) if (parameters.GetIntegerParameter("VkInstanceInfo_EnabledLayerCount", &iParam))
{ {
additionalLayers.reserve(iParam); additionalLayers.reserve(iParam);
for (int i = 0; i < iParam; ++i) for (long long i = 0; i < iParam; ++i)
{ {
Nz::String parameterName = "VkInstanceInfo_EnabledLayer" + String::Number(i); Nz::String parameterName = "VkInstanceInfo_EnabledLayer" + String::Number(i);
Nz::String layer; Nz::String layer;
@ -171,13 +171,13 @@ namespace Nz
UInt32(enabledExtensions.size()), UInt32(enabledExtensions.size()),
enabledExtensions.data() enabledExtensions.data()
}; };
if (!s_instance.Create(instanceInfo)) if (!s_instance.Create(instanceInfo))
{ {
NazaraError("Failed to create instance"); NazaraError("Failed to create instance");
return false; return false;
} }
std::vector<VkPhysicalDevice> physDevices; std::vector<VkPhysicalDevice> physDevices;
if (!s_instance.EnumeratePhysicalDevices(&physDevices)) if (!s_instance.EnumeratePhysicalDevices(&physDevices))
{ {
@ -299,7 +299,7 @@ namespace Nz
std::vector<const char*> enabledExtensions; std::vector<const char*> enabledExtensions;
bool bParam; bool bParam;
int iParam; long long iParam;
if (!s_initializationParameters.GetBooleanParameter("VkDeviceInfo_OverrideEnabledLayers", &bParam) || !bParam) if (!s_initializationParameters.GetBooleanParameter("VkDeviceInfo_OverrideEnabledLayers", &bParam) || !bParam)
{ {
@ -310,7 +310,7 @@ namespace Nz
if (s_initializationParameters.GetIntegerParameter("VkDeviceInfo_EnabledLayerCount", &iParam)) if (s_initializationParameters.GetIntegerParameter("VkDeviceInfo_EnabledLayerCount", &iParam))
{ {
additionalLayers.reserve(iParam); additionalLayers.reserve(iParam);
for (int i = 0; i < iParam; ++i) for (long long i = 0; i < iParam; ++i)
{ {
Nz::String parameterName = "VkDeviceInfo_EnabledLayer" + String::Number(i); Nz::String parameterName = "VkDeviceInfo_EnabledLayer" + String::Number(i);
Nz::String layer; Nz::String layer;
@ -330,7 +330,7 @@ namespace Nz
std::vector<String> additionalExtensions; // Just to keep the String alive std::vector<String> additionalExtensions; // Just to keep the String alive
if (s_initializationParameters.GetIntegerParameter("VkDeviceInfo_EnabledExtensionCount", &iParam)) if (s_initializationParameters.GetIntegerParameter("VkDeviceInfo_EnabledExtensionCount", &iParam))
{ {
for (int i = 0; i < iParam; ++i) for (long long i = 0; i < iParam; ++i)
{ {
Nz::String parameterName = "VkDeviceInfo_EnabledExtension" + String::Number(i); Nz::String parameterName = "VkDeviceInfo_EnabledExtension" + String::Number(i);
Nz::String extension; Nz::String extension;

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

@ -5,7 +5,7 @@
#include <Nazara/VulkanRenderer/VulkanRenderer.hpp> #include <Nazara/VulkanRenderer/VulkanRenderer.hpp>
#include <Nazara/Core/ErrorFlags.hpp> #include <Nazara/Core/ErrorFlags.hpp>
#include <Nazara/Renderer/RenderDeviceInstance.hpp> #include <Nazara/Renderer/RenderDeviceInstance.hpp>
#include <Nazara/VulkanRenderer/VulkanBuffer.hpp> //#include <Nazara/VulkanRenderer/VulkanBuffer.hpp>
#include <Nazara/VulkanRenderer/VulkanSurface.hpp> #include <Nazara/VulkanRenderer/VulkanSurface.hpp>
#include <Nazara/VulkanRenderer/VkRenderWindow.hpp> #include <Nazara/VulkanRenderer/VkRenderWindow.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp> #include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
@ -78,7 +78,7 @@ namespace Nz
{ {
RenderDevice device; RenderDevice device;
device.name = physDevice.properties.deviceName; device.name = physDevice.properties.deviceName;
switch (physDevice.properties.deviceType) switch (physDevice.properties.deviceType)
{ {
case VK_PHYSICAL_DEVICE_TYPE_CPU: case VK_PHYSICAL_DEVICE_TYPE_CPU: