Embed GLSL files during build #238
Conversation
dethrace-labs
commented
Nov 10, 2022
dethrace-labs
commented
- Adds separate files for our GLSL shaders
- Adds generation step for each one to convert it into a header file during the cmake pipeline
- Begin to separate out a section at the top of the logs that we will ask users to copy when filing issues
src/harness/CMakeLists.txt
Outdated
| foreach(elem resources/framebuffer_vert.glsl resources/framebuffer_frag.glsl resources/3d_vert.glsl resources/3d_frag.glsl) | ||
| add_custom_command( | ||
| OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${elem}.h" | ||
| COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DFILE="${elem}" -P ${CMAKE_SOURCE_DIR}/cmake/EmbedResource.cmake |
There was a problem hiding this comment.
CMAKE_SOURCE_DIR points to the root of a build tree, where we want the root of the the dethrace project.
| COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DFILE="${elem}" -P ${CMAKE_SOURCE_DIR}/cmake/EmbedResource.cmake | |
| COMMAND "${CMAKE_COMMAND}" "-DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}" "-DFILE=${elem}" -P "${dethrace_SOURCE_DIR}/cmake/EmbedResource.cmake" |
There was a problem hiding this comment.
I understand the ", but why dethrace_SOURCE_DIR? These are resources specific to harness, and should only be available to #include from harness code? Currently the files are generated in src/harness/resources/
There was a problem hiding this comment.
Looking at it, use of CMAKE_CURRENT_SOURCE_DIR is correct.
But CMAKE_SOURCE_DIR isn't: it should be either PROJECT_SOURCE_DIR or dethrace_SOURCE_DIR.
I updated my suggestion.
There was a problem hiding this comment.
are you suggesting to move cmake/EmbedResource.cmake to src/DETHRACE/cmake/EmbedResource.cmake?
There was a problem hiding this comment.
No, if you happen to include dethrace as a subproject for your own project (using add_subdirectory), CMAKE_SOURCE_DIR points to the root source directory of the master project. Not to the root directory of dethrace.
There was a problem hiding this comment.
ah, yep, I got it I think.
src/harness/resources/3d_vert.glsl
Outdated
| v_normal = a_normal; | ||
| v_tex_coord = a_uv; | ||
| gl_Position = u_projection * u_view * vec4(v_frag_pos, 1.0); | ||
| } |
