From 990193ebb4ff75ae90d6a6aad40ad2b7b25aa5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= <lynix680@gmail.com>
Date: Sun, 2 May 2021 13:58:56 +0200
Subject: [PATCH] Minor fixes

---
 src/Nazara/Core/ParameterList.cpp               | 4 ++--
 src/Nazara/OpenGLRenderer/Wrapper/Context.cpp   | 4 +---
 src/Nazara/VulkanRenderer/VulkanCommandPool.cpp | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Nazara/Core/ParameterList.cpp b/src/Nazara/Core/ParameterList.cpp
index c22ee24e6..3ccf9c98f 100644
--- a/src/Nazara/Core/ParameterList.cpp
+++ b/src/Nazara/Core/ParameterList.cpp
@@ -39,8 +39,8 @@ namespace Nz
 	*/
 	void ParameterList::Clear()
 	{
-		for (auto it = m_parameters.begin(); it != m_parameters.end(); ++it)
-			DestroyValue(it->second);
+		for (auto& parameter : m_parameters)
+			DestroyValue(parameter.second);
 
 		m_parameters.clear();
 	}
diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp b/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp
index 90192071f..d3e89d493 100644
--- a/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp
+++ b/src/Nazara/OpenGLRenderer/Wrapper/Context.cpp
@@ -73,8 +73,7 @@ namespace Nz::GL
 
 			func = reinterpret_cast<FuncType>(originalFuncPtr);
 
-#if !defined(NAZARA_COMPILER_MSVC) || NAZARA_PLATFORM_x64
-#if NAZARA_OPENGLRENDERER_DEBUG
+#if defined(NAZARA_OPENGLRENDERER_DEBUG) && (!defined(NAZARA_COMPILER_MSVC) || defined(NAZARA_PLATFORM_x64))
 			if (func)
 			{
 				if (std::strcmp(funcName, "glGetError") != 0) //< Prevent infinite recursion
@@ -83,7 +82,6 @@ namespace Nz::GL
 					func = Wrapper::WrapErrorHandling();
 				}
 			}
-#endif
 #endif
 
 			if (!func)
diff --git a/src/Nazara/VulkanRenderer/VulkanCommandPool.cpp b/src/Nazara/VulkanRenderer/VulkanCommandPool.cpp
index a654c45b6..5076946b4 100644
--- a/src/Nazara/VulkanRenderer/VulkanCommandPool.cpp
+++ b/src/Nazara/VulkanRenderer/VulkanCommandPool.cpp
@@ -18,7 +18,7 @@ namespace Nz
 		{
 			Vk::AutoCommandBuffer& commandBuffer = commandBuffers.emplace_back(m_commandPool.AllocateCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY));
 
-			if (!commandBuffer->Begin())
+			if (!commandBuffer->Begin(VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT))
 				throw std::runtime_error("failed to begin command buffer: " + TranslateVulkanError(commandBuffer->GetLastErrorCode()));
 
 			VulkanCommandBufferBuilder builder(commandBuffer.Get(), imageIndex);