From ccd7885213f2cffc1da653d9c6350356e1876777 Mon Sep 17 00:00:00 2001
From: SirLynix <lynix680@gmail.com>
Date: Sun, 19 Jun 2022 19:15:02 +0200
Subject: [PATCH] Fix compilation

---
 .../Graphics/PhysicallyBasedMaterial.hpp       |  2 +-
 src/Nazara/Graphics/Graphics.cpp               |  2 +-
 .../Graphics/PhysicallyBasedMaterial.cpp       | 18 +++++++++---------
 .../Shaders/PhysicallyBasedMaterial.nzsl       |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/Nazara/Graphics/PhysicallyBasedMaterial.hpp b/include/Nazara/Graphics/PhysicallyBasedMaterial.hpp
index f82ce7e3b..6e038a21e 100644
--- a/include/Nazara/Graphics/PhysicallyBasedMaterial.hpp
+++ b/include/Nazara/Graphics/PhysicallyBasedMaterial.hpp
@@ -106,7 +106,7 @@ namespace Nz
 
 			static MaterialSettings::Builder Build(PbrBuildOptions& options);
 			static std::vector<std::shared_ptr<UberShader>> BuildShaders();
-			static std::pair<PbrUniformOffsets, FieldOffsets> BuildUniformOffsets();
+			static std::pair<PbrUniformOffsets, nzsl::FieldOffsets> BuildUniformOffsets();
 
 		private:
 			static bool Initialize();
diff --git a/src/Nazara/Graphics/Graphics.cpp b/src/Nazara/Graphics/Graphics.cpp
index 4fa263586..231d0a13a 100644
--- a/src/Nazara/Graphics/Graphics.cpp
+++ b/src/Nazara/Graphics/Graphics.cpp
@@ -38,7 +38,7 @@ namespace Nz
 		};
 
 		const UInt8 r_physicallyBasedMaterialShader[] = {
-			#include <Nazara/Graphics/Resources/Shaders/PhysicallyBasedMaterial.nzsl.h>
+			#include <Nazara/Graphics/Resources/Shaders/PhysicallyBasedMaterial.nzslb.h>
 		};
 
 		const UInt8 r_instanceDataModule[] = {
diff --git a/src/Nazara/Graphics/PhysicallyBasedMaterial.cpp b/src/Nazara/Graphics/PhysicallyBasedMaterial.cpp
index 3a8ad193e..33d2dce4c 100644
--- a/src/Nazara/Graphics/PhysicallyBasedMaterial.cpp
+++ b/src/Nazara/Graphics/PhysicallyBasedMaterial.cpp
@@ -7,10 +7,10 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Graphics/PredefinedShaderStructs.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <Nazara/Shader/ShaderLangParser.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
-#include <Nazara/Utility/FieldOffsets.hpp>
 #include <Nazara/Utility/MaterialData.hpp>
+#include <NZSL/FieldOffsets.hpp>
+#include <NZSL/Parser.hpp>
 #include <cassert>
 #include <filesystem>
 #include <Nazara/Graphics/Debug.hpp>
@@ -249,7 +249,7 @@ namespace Nz
 			options.defaultValues
 		});
 
-		settings.sharedUniformBlocks.push_back(PredefinedLightData::GetUniformBlock(6, ShaderStageType::Fragment));
+		settings.sharedUniformBlocks.push_back(PredefinedLightData::GetUniformBlock(6, nzsl::ShaderStageType::Fragment));
 		settings.predefinedBindings[UnderlyingCast(PredefinedShaderBinding::LightDataUbo)] = 6;
 
 		settings.shaders = options.shaders;
@@ -342,20 +342,20 @@ namespace Nz
 
 	std::vector<std::shared_ptr<UberShader>> PhysicallyBasedMaterial::BuildShaders()
 	{
-		auto shader = std::make_shared<UberShader>(ShaderStageType::Fragment | ShaderStageType::Vertex, "PhysicallyBasedMaterial");
+		auto shader = std::make_shared<UberShader>(nzsl::ShaderStageType::Fragment | nzsl::ShaderStageType::Vertex, "PhysicallyBasedMaterial");
 
 		return { std::move(shader) };
 	}
 
-	auto PhysicallyBasedMaterial::BuildUniformOffsets() -> std::pair<PbrUniformOffsets, FieldOffsets>
+	auto PhysicallyBasedMaterial::BuildUniformOffsets() -> std::pair<PbrUniformOffsets, nzsl::FieldOffsets>
 	{
 		auto basicOffsets = BasicMaterial::BuildUniformOffsets();
-		FieldOffsets fieldOffsets = basicOffsets.second;
+		nzsl::FieldOffsets fieldOffsets = basicOffsets.second;
 
 		PbrUniformOffsets uniformOffsets;
-		uniformOffsets.ambientColor = fieldOffsets.AddField(StructFieldType::Float3);
-		uniformOffsets.specularColor = fieldOffsets.AddField(StructFieldType::Float3);
-		uniformOffsets.shininess = fieldOffsets.AddField(StructFieldType::Float1);
+		uniformOffsets.ambientColor = fieldOffsets.AddField(nzsl::StructFieldType::Float3);
+		uniformOffsets.specularColor = fieldOffsets.AddField(nzsl::StructFieldType::Float3);
+		uniformOffsets.shininess = fieldOffsets.AddField(nzsl::StructFieldType::Float1);
 
 		uniformOffsets.totalSize = fieldOffsets.GetAlignedSize();
 
diff --git a/src/Nazara/Graphics/Resources/Shaders/PhysicallyBasedMaterial.nzsl b/src/Nazara/Graphics/Resources/Shaders/PhysicallyBasedMaterial.nzsl
index eea4602a1..6ccf54dd3 100644
--- a/src/Nazara/Graphics/Resources/Shaders/PhysicallyBasedMaterial.nzsl
+++ b/src/Nazara/Graphics/Resources/Shaders/PhysicallyBasedMaterial.nzsl
@@ -1,9 +1,9 @@
 [nzsl_version("1.0")]
 module PhysicallyBasedMaterial;
 
-import Engine.InstanceData;
-import Engine.LightData;
-import Engine.ViewerData;
+import InstanceData from Engine.InstanceData;
+import LightData from Engine.LightData;
+import ViewerData from Engine.ViewerData;
 
 // Basic material options
 option HasDiffuseTexture: bool = false;