chore: make sure shader compiler uses std expected

Author: Laupetin

src/ObjCompiling/Shader/D3DShaderCompiler.cpp

@@ -122,26 +122,26 @@ namespace shader
 #endif
     }
 
-    result::Expected<std::optional<CompiledShader>, std::string> CompileShader(const std::string& shaderFile,
-                                                                               const std::string& entryPoint,
-                                                                               const std::string& target,
-                                                                               const bool debug,
-                                                                               ISearchPath& searchPath,
-                                                                               MemoryManager& memory)
+    std::expected<std::optional<CompiledShader>, std::string> CompileShader(const std::string& shaderFile,
+                                                                            const std::string& entryPoint,
+                                                                            const std::string& target,
+                                                                            const bool debug,
+                                                                            ISearchPath& searchPath,
+                                                                            MemoryManager& memory)
     {
 #ifdef _WIN32
         if (!initialized)
             InitializeShaderCompilation();
         if (!compilationAvailable)
-            return result::Unexpected<std::string>("Shader compilation unavailable");
+            return std::unexpected("Shader compilation unavailable");
 
         const auto fileName = GetSourceFileNameForShaderAssetName(shaderFile);
         auto file = searchPath.Open(fileName);
         if (!file.IsOpen() || file.m_length <= 0)
             return std::optional<CompiledShader>(std::nullopt);
 
         if (std::cmp_greater(file.m_length, MAX_SHADER_SIZE))
-            return result::Unexpected(std::format("File too big: {}", file.m_length));
+            return std::unexpected(std::format("File too big: {}", file.m_length));
 
         const auto shaderSize = file.m_length;
         const auto shaderData = std::make_unique<char[]>(static_cast<size_t>(shaderSize));
@@ -185,7 +185,7 @@ namespace shader
             if (shaderBlob)
                 shaderBlob->Release();
 
-            return result::Unexpected(std::move(errorMessage));
+            return std::unexpected(std::move(errorMessage));
         }
 
         const auto shaderBlobSize = static_cast<size_t>(shaderBlob->GetBufferSize());

src/ObjCompiling/Shader/D3DShaderCompiler.h

@@ -2,8 +2,8 @@
 
 #include "SearchPath/ISearchPath.h"
 #include "Utils/MemoryManager.h"
-#include "Utils/Result.h"
 
+#include <expected>
 #include <optional>
 #include <string>
 
@@ -18,6 +18,6 @@ namespace shader
 
     bool ShaderCompilationAvailable();
 
-    result::Expected<std::optional<CompiledShader>, std::string> CompileShader(
+    std::expected<std::optional<CompiledShader>, std::string> CompileShader(
         const std::string& shaderFile, const std::string& entryPoint, const std::string& target, bool debug, ISearchPath& searchPath, MemoryManager& memory);
 } // namespace shader