allemang.d/toddcox-visualize
1
0
Fork 0
mirror of https://github.com/allemangD/toddcox-visualize.git synced 2025-11-10 12:02:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

ENH: Embed shader source in binary.

Browse Source
This commit is contained in:
David Allemang
2023-01-27 09:35:29 -05:00
parent fff18e481f
commit b228f76658
8 changed files with 120 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vis/CMakeLists.txt
View File

@@ -1,9 +1,11 @@
add_custom_target(shaders ALL DEPENDS shader_output)
add_custom_command(
OUTPUT shader_output
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/shaders ${CMAKE_CURRENT_BINARY_DIR}/shaders
COMMENT "copied shaders"
)
#add_custom_target(shaders ALL DEPENDS shader_output)
#add_custom_command(
# OUTPUT shader_output
# COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/shaders ${CMAKE_CURRENT_BINARY_DIR}/shaders
# COMMENT "copied shaders"
#)
add_subdirectory(shaders)
add_custom_target(presets ALL DEPENDS preset_output)
add_custom_command(
@@ -17,5 +19,5 @@ target_include_directories(vis-util INTERFACE include)
add_executable(vis src/main.cpp)
target_include_directories(vis PRIVATE include)
target_link_libraries(vis PRIVATE tc glad glm glfw yaml-cpp)
add_dependencies(vis shaders presets)
target_link_libraries(vis PRIVATE tc glad glm glfw yaml-cpp shaders)
add_dependencies(vis presets)

4
vis/include/cgl/shaderprogram.hpp
View File

@@ -19,7 +19,9 @@ namespace cgl{
glProgramParameteri(id, GL_PROGRAM_SEPARABLE, GL_TRUE);
}
ShaderProgram(const std::string &src) : ShaderProgram() {
explicit ShaderProgram(const std::string_view &src) : ShaderProgram(std::string(src)) {}
explicit ShaderProgram(const std::string &src) : ShaderProgram() {
Shader<mode> sh(src);
attach(sh);

10
vis/shaders/CMakeLists.txt Normal file
View File

@@ -0,0 +1,10 @@
add_embed_library(shaders
curve-ortho.gm.glsl
curve-stereo.gm.glsl
diffuse.fs.glsl
direct-ortho.vs.glsl
direct-stereo.vs.glsl
solid.fs.glsl
deferred.vs.glsl
slice.gm.glsl
)

0
vis/shaders/slice/deferred.vs.glsl → vis/shaders/deferred.vs.glsl
View File

0
vis/shaders/slice/slice.gm.glsl → vis/shaders/slice.gm.glsl
View File

22
vis/src/main.cpp
View File

@@ -19,6 +19,8 @@
#include <chrono>
#include <yaml-cpp/yaml.h>
#include <shaders.hpp>
#ifdef _WIN32
extern "C" {
__attribute__((unused)) __declspec(dllexport) int NvOptimusEnablement = 0x00000001;
@@ -155,12 +157,9 @@ struct SliceProp : public Prop<N> {
template<unsigned N>
struct SliceRenderer : public Renderer<N> {
cgl::pgm::vert defer = cgl::pgm::vert::file(
"shaders/slice/deferred.vs.glsl");
cgl::pgm::geom slice = cgl::pgm::geom::file(
"shaders/slice/slice.gm.glsl");
cgl::pgm::frag solid = cgl::pgm::frag::file(
"shaders/solid.fs.glsl");
cgl::pgm::vert defer = cgl::pgm::vert(shaders::deferred_vs_glsl);
cgl::pgm::geom slice = cgl::pgm::geom(shaders::slice_gm_glsl);
cgl::pgm::frag solid = cgl::pgm::frag(shaders::solid_fs_glsl);
cgl::pipeline pipe;
@@ -193,8 +192,7 @@ template<unsigned N>
struct DirectRenderer : public Renderer<N> {
cgl::pipeline pipe;
cgl::pgm::frag solid = cgl::pgm::frag::file(
"shaders/solid.fs.glsl");
cgl::pgm::frag solid = cgl::pgm::frag(shaders::solid_fs_glsl);
DirectRenderer() {
pipe.stage(solid);
@@ -255,10 +253,10 @@ void run(const std::string &config_file, GLFWwindow *window) {
SliceRenderer<4> sRen{};
cgl::pgm::vert o = cgl::pgm::vert::file("shaders/direct-ortho.vs.glsl");
cgl::pgm::vert s = cgl::pgm::vert::file("shaders/direct-stereo.vs.glsl");
cgl::pgm::geom co = cgl::pgm::geom::file("shaders/curve-ortho.gm.glsl");
cgl::pgm::geom cs = cgl::pgm::geom::file("shaders/curve-stereo.gm.glsl");
cgl::pgm::vert o = cgl::pgm::vert(shaders::direct_ortho_vs_glsl);
cgl::pgm::vert s = cgl::pgm::vert(shaders::direct_stereo_vs_glsl);
cgl::pgm::geom co = cgl::pgm::geom(shaders::curve_ortho_gm_glsl);
cgl::pgm::geom cs = cgl::pgm::geom(shaders::curve_stereo_gm_glsl);
DirectRenderer<2> woRen{};
woRen.pipe.stage(o);