Fix build time shader compilation for multi config cmake generators

andrejnau · Jan 23, 2024 · 577507d · 577507d
1 parent 6941505
commit 577507d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/cmake/compile_shaders.cmake b/cmake/compile_shaders.cmake
@@ -1,22 +1,29 @@
-function(compile_shaders target base_dir output_subdir shaders output_var)
+function(compile_shaders base_dir output_subdir shaders output_var)
     if (CMAKE_CROSSCOMPILING AND IOS_OR_TVOS)
         set(shader_compiler_cli "${CMAKE_BINARY_DIR}/macOS/bin/ShaderCompilerCLI")
     else()
         set(shader_compiler_cli "$<TARGET_FILE:ShaderCompilerCLI>")
     endif()
-    set(output_dir "${CMAKE_BINARY_DIR}/bin/${output_subdir}/")
+    if (CMAKE_CONFIGURATION_TYPES)
+        set(output_dir "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/${output_subdir}/")
+    else()
+        set(output_dir "${CMAKE_BINARY_DIR}/bin/${output_subdir}/")
+    endif()
+    set(gen_dir "${CMAKE_BINARY_DIR}/compiled_shaders/${output_subdir}/")
+    unset(compiled_shaders)
     foreach(full_shader_path ${shaders})
         cmake_path(RELATIVE_PATH full_shader_path BASE_DIRECTORY "${base_dir}" OUTPUT_VARIABLE shader_name)
         get_filename_component(shader_folder ${shader_name} DIRECTORY)
-        set(spirv ${output_dir}/${shader_name}.spirv)
-        set(dxil ${output_dir}/${shader_name}.dxil)
+        set(spirv ${gen_dir}/${shader_name}.spirv)
+        set(dxil ${gen_dir}/${shader_name}.dxil)
         get_property(entrypoint SOURCE ${full_shader_path} PROPERTY SHADER_ENTRYPOINT)
         get_property(type SOURCE ${full_shader_path} PROPERTY SHADER_TYPE)
         get_property(model SOURCE ${full_shader_path} PROPERTY SHADER_MODEL)
         add_custom_command(OUTPUT ${spirv} ${dxil}
-            COMMAND ${CMAKE_COMMAND} -E echo ${shader_name} ${full_shader_path} ${entrypoint} ${type} ${model} ${output_dir}
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${output_dir}/${shader_folder}
-            COMMAND ${shader_compiler_cli} ${shader_name} ${full_shader_path} ${entrypoint} ${type} ${model} ${output_dir}
+            COMMAND ${CMAKE_COMMAND} -E echo ${shader_name} ${full_shader_path} ${entrypoint} ${type} ${model} ${gen_dir}
+            COMMAND ${CMAKE_COMMAND} -E make_directory ${gen_dir}/${shader_folder}
+            COMMAND ${shader_compiler_cli} ${shader_name} ${full_shader_path} ${entrypoint} ${type} ${model} ${gen_dir}
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${gen_dir}/${shader_folder} ${output_dir}/${shader_folder}
             DEPENDS ShaderCompilerCLI
             MAIN_DEPENDENCY "${full_shader_path}"
         )

diff --git a/src/Apps/Triangle/CMakeLists.txt b/src/Apps/Triangle/CMakeLists.txt
@@ -19,7 +19,7 @@ set_property(SOURCE ${pixel_shaders} PROPERTY SHADER_TYPE Pixel)
 set(shaders_files ${pixel_shaders} ${vertex_shaders})
 
 include(compile_shaders)
-compile_shaders(Triangle "${shaders_path}" "asserts/Triangle" "${shaders_files}" resources)
+compile_shaders("${shaders_path}" "asserts/Triangle" "${shaders_files}" resources)
 
 add_executable(Triangle WIN32 MACOSX_BUNDLE
    ${resources}

diff --git a/src/Apps/Triangle/main.cpp b/src/Apps/Triangle/main.cpp
@@ -89,8 +89,8 @@ void TriangleRenderer::Init(const AppSize& app_size, WindowHandle window)
     }
     std::string vertex_path = GetAssertPath("asserts/Triangle/VertexShader.hlsl" + shader_blob_ext);
     std::string pixel_path = GetAssertPath("asserts/Triangle/PixelShader.hlsl" + shader_blob_ext);
-    vertex_shader = device->CreateShader(ReadBinaryFile(vertex_path), ShaderBlobType::kSPIRV, ShaderType::kVertex);
-    pixel_shader = device->CreateShader(ReadBinaryFile(pixel_path), ShaderBlobType::kSPIRV, ShaderType::kPixel);
+    vertex_shader = device->CreateShader(ReadBinaryFile(vertex_path), blob_type, ShaderType::kVertex);
+    pixel_shader = device->CreateShader(ReadBinaryFile(pixel_path), blob_type, ShaderType::kPixel);
     program = device->CreateProgram({ vertex_shader, pixel_shader });
 
     ViewDesc constant_view_desc = {};