zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-04-21 10:58:44 +00:00
Code Activity

chore: make sure shader compiler uses std expected

Browse Source
This commit is contained in:
Jan Laupetin
2026-04-08 11:47:14 +01:00
parent b90feffe14
commit 73f6f5573d
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ObjCompiling/Shader/D3DShaderCompiler.cpp
View File

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

4
src/ObjCompiling/Shader/D3DShaderCompiler.h
View File

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