From 29cad19253f999f141760fb11dc26e226f130821 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 4 Jul 2017 23:57:43 +0200 Subject: [PATCH] Fix some compilation errors --- src/Nazara/VulkanRenderer/Vulkan.cpp | 20 ++++++++++---------- src/Nazara/VulkanRenderer/VulkanRenderer.cpp | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Nazara/VulkanRenderer/Vulkan.cpp b/src/Nazara/VulkanRenderer/Vulkan.cpp index 3cab39710..65351a20f 100644 --- a/src/Nazara/VulkanRenderer/Vulkan.cpp +++ b/src/Nazara/VulkanRenderer/Vulkan.cpp @@ -62,16 +62,16 @@ namespace Nz parameters.GetStringParameter("VkAppInfo_OverrideEngineName", &engineName); bool bParam; - int iParam; + long long iParam; if (parameters.GetIntegerParameter("VkAppInfo_OverrideAPIVersion", &iParam)) - apiVersion = iParam; + apiVersion = static_cast(iParam); if (parameters.GetIntegerParameter("VkAppInfo_OverrideApplicationVersion", &iParam)) - appVersion = iParam; + appVersion = static_cast(iParam); if (parameters.GetIntegerParameter("VkAppInfo_OverrideEngineVersion", &iParam)) - engineVersion = iParam; + engineVersion = static_cast(iParam); VkApplicationInfo appInfo = { VK_STRUCTURE_TYPE_APPLICATION_INFO, @@ -100,7 +100,7 @@ namespace Nz if (parameters.GetIntegerParameter("VkInstanceInfo_EnabledLayerCount", &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 layer; @@ -171,13 +171,13 @@ namespace Nz UInt32(enabledExtensions.size()), enabledExtensions.data() }; - + if (!s_instance.Create(instanceInfo)) { NazaraError("Failed to create instance"); return false; } - + std::vector physDevices; if (!s_instance.EnumeratePhysicalDevices(&physDevices)) { @@ -299,7 +299,7 @@ namespace Nz std::vector enabledExtensions; bool bParam; - int iParam; + long long iParam; if (!s_initializationParameters.GetBooleanParameter("VkDeviceInfo_OverrideEnabledLayers", &bParam) || !bParam) { @@ -310,7 +310,7 @@ namespace Nz if (s_initializationParameters.GetIntegerParameter("VkDeviceInfo_EnabledLayerCount", &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 layer; @@ -330,7 +330,7 @@ namespace Nz std::vector additionalExtensions; // Just to keep the String alive 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 extension; diff --git a/src/Nazara/VulkanRenderer/VulkanRenderer.cpp b/src/Nazara/VulkanRenderer/VulkanRenderer.cpp index 7485be521..3db104ee6 100644 --- a/src/Nazara/VulkanRenderer/VulkanRenderer.cpp +++ b/src/Nazara/VulkanRenderer/VulkanRenderer.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +//#include #include #include #include @@ -78,7 +78,7 @@ namespace Nz { RenderDevice device; device.name = physDevice.properties.deviceName; - + switch (physDevice.properties.deviceType) { case VK_PHYSICAL_DEVICE_TYPE_CPU: