Skip to content

Commit a5207ab

Browse files
committed
Add bake_wgsl_source as custom target and pt dependency
1 parent 1df4306 commit a5207ab

4 files changed

Lines changed: 69 additions & 32 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,23 @@ target_link_libraries(pt-format PRIVATE common fmt glm::glm)
7070
add_executable(pt-format-tool src/pt-format-tool/main.cpp)
7171
target_link_libraries(pt-format-tool PRIVATE common fmt pt-format glm::glm)
7272

73+
# bake-wgsl
74+
set(WGSL_SHADER_FILES
75+
reference_path_tracer.wgsl
76+
texture_blit.wgsl
77+
hybrid_renderer.wgsl)
78+
79+
set(SHADER_SOURCE_HEADER_FILE src/pt/shader_source.hpp)
80+
81+
include(cmake/BakeWgslSource.cmake)
82+
add_custom_command(
83+
OUTPUT ${SHADER_SOURCE_HEADER_FILE}
84+
COMMAND ${CMAKE_COMMAND} -DCALL_BAKE_WGSL_SOURCE=1 -DOUTPUT_FILE=${SHADER_SOURCE_HEADER_FILE} -DWGSL_FILES="${WGSL_SHADER_FILES}" -P ${CMAKE_SOURCE_DIR}/cmake/BakeWgslSource.cmake
85+
COMMENT "Generating ${SHADER_SOURCE_HEADER_FILE} from .wgsl files"
86+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
87+
)
88+
add_custom_target(bake-wgsl DEPENDS ${SHADER_SOURCE_HEADER_FILE})
89+
7390
# pt
7491
set(PT_SOURCE_FILES
7592
fly_camera_controller.cpp
@@ -85,32 +102,8 @@ set(PT_SOURCE_FILES
85102
window.cpp)
86103
list(TRANSFORM PT_SOURCE_FILES PREPEND src/pt/)
87104

88-
set(WGSL_SHADER_FILES
89-
reference_path_tracer.wgsl
90-
texture_blit.wgsl
91-
hybrid_renderer.wgsl)
92-
93-
function(append_wgsl_to_header OUTPUT_FILE WGSL_FILES)
94-
file(WRITE ${OUTPUT_FILE} "// This file is generated by CMake. Do not edit this file!\n\n")
95-
file(APPEND ${OUTPUT_FILE} "#pragma once\n\n")
96-
file(APPEND ${OUTPUT_FILE} "namespace nlrs\n{\n")
97-
98-
foreach(WGSL_FILE IN LISTS WGSL_FILES)
99-
file(READ ${CMAKE_SOURCE_DIR}/src/pt/${WGSL_FILE} WGSL_CONTENT)
100-
string(REPLACE ".wgsl" "" VAR_NAME ${WGSL_FILE})
101-
string(TOUPPER ${VAR_NAME} VAR_NAME)
102-
file(APPEND ${OUTPUT_FILE} "const char* const ${VAR_NAME}_SOURCE = R\"(\n")
103-
file(APPEND ${OUTPUT_FILE} "${WGSL_CONTENT}")
104-
file(APPEND ${OUTPUT_FILE} ")\";\n\n")
105-
endforeach()
106-
107-
file(APPEND ${OUTPUT_FILE} "} // namespace nlrs\n")
108-
endfunction()
109-
110-
# CMake seems to treat the list as separate arguments, so we need to wrap it in a concatenated string.
111-
append_wgsl_to_header(${CMAKE_SOURCE_DIR}/src/pt/shader_source.hpp "${WGSL_SHADER_FILES}")
112-
113105
add_executable(pt ${PT_SOURCE_FILES})
106+
add_dependencies(pt bake-wgsl)
114107
target_link_libraries(pt PRIVATE common fmt glfw glfw3webgpu glm::glm hw-skymodel imgui pt-format webgpu_dawn)
115108
set_target_properties(pt PROPERTIES COMPILE_WARNING_AS_ERROR ON)
116109

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ $ cmake -B build-debug -S . -DCMAKE_BUILD_TYPE=Debug
4949
$ cmake --build build-debug --target pt -- -j 32
5050
```
5151

52+
The shaders are appended to a header file as raw strings during the `pt` build step. Updating the header file can also be invoked manually:
53+
54+
```sh
55+
$ cmake --build build-debug --target bake-wgsl
56+
```
57+
5258
It's recommendable to build using ccache in case Dawn ever needs to be rebuilt. See [ccache.md](notes/ccache.md) for instructions.
5359

5460
## Run

‎cmake/BakeWgslSource.cmake‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
function(bake_wgsl_source OUTPUT_FILE WGSL_FILES_LIST_STR)
2+
file(WRITE ${OUTPUT_FILE} "// This file is generated by CMake. Do not edit this file!\n\n")
3+
file(APPEND ${OUTPUT_FILE} "#pragma once\n\n")
4+
file(APPEND ${OUTPUT_FILE} "namespace nlrs\n{\n")
5+
string(REPLACE " " ";" WGSL_FILES ${WGSL_FILES_LIST_STR})
6+
7+
foreach(WGSL_FILE IN LISTS WGSL_FILES)
8+
file(READ ${CMAKE_SOURCE_DIR}/src/pt/${WGSL_FILE} WGSL_CONTENT)
9+
string(REPLACE ".wgsl" "" VAR_NAME ${WGSL_FILE})
10+
string(TOUPPER ${VAR_NAME} VAR_NAME)
11+
12+
# Split WGSL_CONTENT into chunks. Work-around for C2026 errors in MSVC (single-line string too big).
13+
string(LENGTH "${WGSL_CONTENT}" CONTENT_LENGTH)
14+
math(EXPR CONTENT_LENGTH "${CONTENT_LENGTH} - 1")
15+
set(OFFSET 0)
16+
set(CHUNK_SIZE 16384)
17+
18+
file(APPEND ${OUTPUT_FILE} "const char* const ${VAR_NAME}_SOURCE = ")
19+
20+
while(OFFSET LESS_EQUAL CONTENT_LENGTH)
21+
math(EXPR END_OFFSET "${OFFSET} + ${CHUNK_SIZE} - 1")
22+
string(SUBSTRING "${WGSL_CONTENT}" ${OFFSET} ${CHUNK_SIZE} CHUNK)
23+
file(APPEND ${OUTPUT_FILE} "R\"(${CHUNK})\"")
24+
math(EXPR OFFSET "${OFFSET} + ${CHUNK_SIZE}")
25+
26+
if(NOT OFFSET GREATER CONTENT_LENGTH)
27+
file(APPEND ${OUTPUT_FILE} "\n")
28+
endif()
29+
endwhile()
30+
31+
file(APPEND ${OUTPUT_FILE} ";\n\n")
32+
endforeach()
33+
34+
file(APPEND ${OUTPUT_FILE} "} // namespace nlrs\n")
35+
endfunction()
36+
37+
if(CALL_BAKE_WGSL_SOURCE)
38+
# CMake seems to treat the list as separate arguments, so we need to wrap it in a concatenated string.
39+
bake_wgsl_source("${OUTPUT_FILE}" "${WGSL_FILES}")
40+
endif()

‎src/pt/shader_source.hpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
namespace nlrs
66
{
7-
const char* const REFERENCE_PATH_TRACER_SOURCE = R"(
8-
struct Uniforms {
7+
const char* const REFERENCE_PATH_TRACER_SOURCE = R"(struct Uniforms {
98
viewProjectionMatrix: mat4x4f,
109
}
1110
@@ -554,7 +553,8 @@ fn rayIntersectTriangle(ray: Ray, tri: Positions, tmax: f32, hit: ptr<function,
554553
}
555554
556555
const ORIGIN = 1f / 32f;
557-
const FLOAT_SCALE = 1f / 65536f;
556+
const FLOAT_SCA)"
557+
R"(LE = 1f / 65536f;
558558
const INT_SCALE = 256f;
559559
560560
@must_use
@@ -676,8 +676,7 @@ fn rngNextInt(state: ptr<function, u32>) {
676676
}
677677
)";
678678

679-
const char* const TEXTURE_BLIT_SOURCE = R"(
680-
struct Uniforms {
679+
const char* const TEXTURE_BLIT_SOURCE = R"(struct Uniforms {
681680
viewProjectionMatrix: mat4x4f,
682681
}
683682
@@ -711,8 +710,7 @@ fn fsMain(in: VertexOutput) -> @location(0) vec4f {
711710
}
712711
)";
713712

714-
const char* const HYBRID_RENDERER_SOURCE = R"(
715-
@group(0) @binding(0) var<uniform> viewProjectionMat: mat4x4f;
713+
const char* const HYBRID_RENDERER_SOURCE = R"(@group(0) @binding(0) var<uniform> viewProjectionMat: mat4x4f;
716714
717715
struct VertexOutput {
718716
@builtin(position) position: vec4f,

0 commit comments

Comments
 (0)