From 8359d46711d0794dc2dcbced36cdf947c5d1e92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= <lynix680@gmail.com>
Date: Sat, 17 Apr 2021 14:45:14 +0200
Subject: [PATCH] Graphics fixes

---
 src/Nazara/Graphics/BasicMaterial.cpp | 6 +++---
 src/Nazara/Graphics/UberShader.cpp    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Nazara/Graphics/BasicMaterial.cpp b/src/Nazara/Graphics/BasicMaterial.cpp
index 220efd6bb..11efad4ef 100644
--- a/src/Nazara/Graphics/BasicMaterial.cpp
+++ b/src/Nazara/Graphics/BasicMaterial.cpp
@@ -8,7 +8,7 @@
 #include <Nazara/Graphics/PredefinedShaderStructs.hpp>
 #include <Nazara/Graphics/UberShader.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <Nazara/Shader/ShaderAstSerializer.hpp>
+#include <Nazara/Shader/Ast/AstSerializer.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
 #include <Nazara/Utility/FieldOffsets.hpp>
 #include <Nazara/Utility/MaterialData.hpp>
@@ -167,8 +167,8 @@ namespace Nz
 		auto& fragmentShader = settings.shaders[UnderlyingCast(ShaderStageType::Fragment)];
 		auto& vertexShader = settings.shaders[UnderlyingCast(ShaderStageType::Vertex)];
 
-		fragmentShader = std::make_shared<UberShader>(ShaderAst::UnserializeShader(r_fragmentShader, sizeof(r_fragmentShader)));
-		vertexShader = std::make_shared<UberShader>(ShaderAst::UnserializeShader(r_vertexShader, sizeof(r_vertexShader)));
+		fragmentShader = std::make_shared<UberShader>(ShaderStageType::Fragment, ShaderAst::UnserializeShader(r_fragmentShader, sizeof(r_fragmentShader)));
+		vertexShader = std::make_shared<UberShader>(ShaderStageType::Vertex, ShaderAst::UnserializeShader(r_vertexShader, sizeof(r_vertexShader)));
 
 		// Conditions
 
diff --git a/src/Nazara/Graphics/UberShader.cpp b/src/Nazara/Graphics/UberShader.cpp
index 2e211d07c..9ecbb888f 100644
--- a/src/Nazara/Graphics/UberShader.cpp
+++ b/src/Nazara/Graphics/UberShader.cpp
@@ -43,7 +43,7 @@ namespace Nz
 		if (it == m_combinations.end())
 		{
 			ShaderWriter::States states;
-			states.enabledConditions = combination;
+			states.enabledOptions = combination;
 
 			std::shared_ptr<ShaderModule> stage = Graphics::Instance()->GetRenderDevice().InstantiateShaderModule(m_shaderStage, m_shaderAst, std::move(states));