First rendering using Spir-V generated shaders \o/

src/Nazara/VulkanRenderer/Vulkan.cpp

@@ -57,7 +57,7 @@ namespace Nz
 		String appName = "Another application made with Nazara Engine";
 		String engineName = "Nazara Engine - Vulkan Renderer";
 
-		constexpr UInt32 appVersion = VK_MAKE_VERSION(1, 0, 0);
+		UInt32 appVersion = VK_MAKE_VERSION(1, 0, 0);
 		UInt32 engineVersion = VK_MAKE_VERSION(1, 0, 0);
 
 		parameters.GetStringParameter("VkAppInfo_OverrideApplicationName", &appName);

src/Nazara/VulkanRenderer/VulkanShaderStage.cpp

@@ -3,25 +3,61 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/VulkanRenderer/VulkanShaderStage.hpp>
+#include <Nazara/Renderer/ShaderAst.hpp>
+#include <Nazara/Renderer/ShaderAstSerializer.hpp>
+#include <Nazara/Renderer/SpirvWriter.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
 {
 	bool VulkanShaderStage::Create(Vk::Device& device, ShaderStageType type, ShaderLanguage lang, const void* source, std::size_t sourceSize)
 	{
-		if (lang != ShaderLanguage::SpirV)
-		{
-			NazaraError("Only Spir-V is supported for now");
-			return false;
-		}
-
-		if (!m_shaderModule.Create(device, reinterpret_cast<const Nz::UInt32*>(source), sourceSize))
-		{
-			NazaraError("Failed to create shader module");
-			return false;
-		}
-
 		m_stage = type;
+
+		switch (lang)
+		{
+			case ShaderLanguage::NazaraBinary:
+			{
+				ByteStream byteStream(source, sourceSize);
+				auto shader = Nz::UnserializeShader(byteStream);
+
+				if (shader.GetStage() != type)
+					throw std::runtime_error("incompatible shader stage");
+
+				SpirvWriter::Environment env;
+
+				SpirvWriter writer;
+				writer.SetEnv(env);
+
+				std::vector<UInt32> code = writer.Generate(shader);
+
+				if (!m_shaderModule.Create(device, code.data(), code.size() * sizeof(UInt32)))
+				{
+					NazaraError("Failed to create shader module");
+					return false;
+				}
+
+				break;
+			}
+
+			case ShaderLanguage::SpirV:
+			{
+				if (!m_shaderModule.Create(device, reinterpret_cast<const Nz::UInt32*>(source), sourceSize))
+				{
+					NazaraError("Failed to create shader module");
+					return false;
+				}
+
+				break;
+			}
+
+			default:
+			{
+				NazaraError("this language is not supported");
+				return false;
+			}
+		}
+
 		return true;
 	}
 }