diff --git a/renderlib/graphics/glsl/shaders.cpp b/renderlib/graphics/glsl/shaders.cpp index 098d3bcb..b7598e3b 100644 --- a/renderlib/graphics/glsl/shaders.cpp +++ b/renderlib/graphics/glsl/shaders.cpp @@ -1,8 +1,8 @@ #include "shaders.h" -#include "shaders/shader_gen.hpp" +#include "shaders/basicVolume_frag_gen.hpp" -static std::unordered_map shader_src = { { "shader", shader_shader } }; +static std::unordered_map shader_src = { { "shader", basicVolume_frag_shader } }; static std::unordered_map shaders; bool diff --git a/renderlib/graphics/glsl/shaders/CMakeLists.txt b/renderlib/graphics/glsl/shaders/CMakeLists.txt index 6fb75e2f..7f90367c 100644 --- a/renderlib/graphics/glsl/shaders/CMakeLists.txt +++ b/renderlib/graphics/glsl/shaders/CMakeLists.txt @@ -23,7 +23,7 @@ ${shader_content} endfunction() # Convert your shader file -convert_shader_to_cpp("shader.frag" "shader") +convert_shader_to_cpp("basicVolume.frag" "basicVolume.frag") # Add the generated C++ file to your target -target_sources(renderlib PRIVATE shader_gen.hpp) +target_sources(renderlib PRIVATE basicVolume_frag_gen.hpp) diff --git a/renderlib/graphics/glsl/shaders/shader.frag b/renderlib/graphics/glsl/shaders/basicVolume.frag similarity index 100% rename from renderlib/graphics/glsl/shaders/shader.frag rename to renderlib/graphics/glsl/shaders/basicVolume.frag diff --git a/renderlib/graphics/glsl/shaders/shader_gen.hpp b/renderlib/graphics/glsl/shaders/basicVolume_frag_gen.hpp similarity index 99% rename from renderlib/graphics/glsl/shaders/shader_gen.hpp rename to renderlib/graphics/glsl/shaders/basicVolume_frag_gen.hpp index dd91d261..3879bb83 100644 --- a/renderlib/graphics/glsl/shaders/shader_gen.hpp +++ b/renderlib/graphics/glsl/shaders/basicVolume_frag_gen.hpp @@ -1,7 +1,7 @@ #include -const std::string shader_shader = R"( +const std::string basicVolume_frag_shader = R"( #version 400 core in VertexData