review fix done

This commit is contained in:
Metehan Tuncbilek
2024-07-16 22:13:44 +03:00
parent dbd7b2dad5
commit 7ea6fc8dc4
2 changed files with 11 additions and 10 deletions

View File

@@ -1,13 +1,16 @@
#if defined(HAS_SHADERC)
#include "ShaderCompiler.hpp" #include "ShaderCompiler.hpp"
#include "Base/Logger.hpp" #include "Base/Logger.hpp"
#include <shaderc/shaderc.hpp>
#include <map> #include <map>
#include <filesystem> #include <filesystem>
namespace OpenVulkano namespace OpenVulkano
{ {
#if defined(HAS_SHADERC)
class ShaderIncluder : public shaderc::CompileOptions::IncluderInterface class ShaderIncluder : public shaderc::CompileOptions::IncluderInterface
{ {
struct IncludeData struct IncludeData
@@ -34,7 +37,7 @@ namespace OpenVulkano
shaderc_shader_kind CheckStage(const std::string& extensionName) shaderc_shader_kind CheckStage(const std::string& extensionName)
{ {
std::map<std::string, shaderc_shader_kind> stageMap = { static std::map<std::string, shaderc_shader_kind> stageMap = {
{ "vert", shaderc_glsl_vertex_shader }, { "frag", shaderc_glsl_fragment_shader }, { "vert", shaderc_glsl_vertex_shader }, { "frag", shaderc_glsl_fragment_shader },
{ "comp", shaderc_glsl_compute_shader }, { "geom", shaderc_glsl_geometry_shader }, { "comp", shaderc_glsl_compute_shader }, { "geom", shaderc_glsl_geometry_shader },
{ "tesc", shaderc_glsl_tess_control_shader }, { "tese", shaderc_glsl_tess_evaluation_shader }, { "tesc", shaderc_glsl_tess_control_shader }, { "tese", shaderc_glsl_tess_evaluation_shader },
@@ -124,5 +127,5 @@ namespace OpenVulkano
if (std::filesystem::exists(path)) return path; if (std::filesystem::exists(path)) return path;
else throw std::runtime_error("Failed to resolve include '" + requestedSource + "'!"); else throw std::runtime_error("Failed to resolve include '" + requestedSource + "'!");
} }
#endif
} }
#endif

View File

@@ -3,8 +3,6 @@
#include "Base/Utils.hpp" #include "Base/Utils.hpp"
#include "Base/Wrapper.hpp" #include "Base/Wrapper.hpp"
#include <shaderc/shaderc.hpp>
namespace OpenVulkano namespace OpenVulkano
{ {
class ShaderCompiler class ShaderCompiler