From 6c0d077fafcded00404307ac974b497ab567d3c5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 17:25:28 +0000 Subject: [PATCH 1/4] Initial plan From 0d9c7386988ac82780af678ffd409c7847a51a07 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 17:30:46 +0000 Subject: [PATCH 2/4] Add SPIRV-Tools source directory to include paths for pass_manager.h spirvgenerator.cc includes spirv-tools/libspirv.h which in Vulkan SDK 1.4.304.1 transitively includes internal headers like pass_manager.h. This fix adds the SPIRV-Tools source directory to the include paths when available. Co-authored-by: Duttenheim <6490176+Duttenheim@users.noreply.github.com> --- code/compiler/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/compiler/CMakeLists.txt b/code/compiler/CMakeLists.txt index f0f8627..905f26d 100644 --- a/code/compiler/CMakeLists.txt +++ b/code/compiler/CMakeLists.txt @@ -36,6 +36,15 @@ if((SPIRV-Tools-opt_LIBRARY OR SPIRV-Tools-opt_DEBUG_LIBRARY) AND NOT TARGET SPI PROPERTY IMPORTED_LOCATION_DEBUG "${SPIRV-Tools-opt_DEBUG_LIBRARY}") endif() + + # Add SPIRV-Tools source directory to include paths if available + # This is needed for some Vulkan SDK versions (e.g., 1.4.304.1) where + # internal headers like pass_manager.h are referenced by public headers + if(DEFINED ENV{VULKAN_SDK}) + set_property(TARGET SPIRV-Tools-opt APPEND + PROPERTY + INTERFACE_INCLUDE_DIRECTORIES "$ENV{VULKAN_SDK}/source") + endif() endif() From eab8df27f65ec96196c830ad58941d25a14eacc3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 17:31:13 +0000 Subject: [PATCH 3/4] Check if SPIRV-Tools source directory exists before adding to include paths Co-authored-by: Duttenheim <6490176+Duttenheim@users.noreply.github.com> --- code/compiler/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/compiler/CMakeLists.txt b/code/compiler/CMakeLists.txt index 905f26d..3a8730f 100644 --- a/code/compiler/CMakeLists.txt +++ b/code/compiler/CMakeLists.txt @@ -41,9 +41,12 @@ if((SPIRV-Tools-opt_LIBRARY OR SPIRV-Tools-opt_DEBUG_LIBRARY) AND NOT TARGET SPI # This is needed for some Vulkan SDK versions (e.g., 1.4.304.1) where # internal headers like pass_manager.h are referenced by public headers if(DEFINED ENV{VULKAN_SDK}) - set_property(TARGET SPIRV-Tools-opt APPEND - PROPERTY - INTERFACE_INCLUDE_DIRECTORIES "$ENV{VULKAN_SDK}/source") + set(SPIRV_TOOLS_SOURCE_DIR "$ENV{VULKAN_SDK}/source") + if(EXISTS "${SPIRV_TOOLS_SOURCE_DIR}") + set_property(TARGET SPIRV-Tools-opt APPEND + PROPERTY + INTERFACE_INCLUDE_DIRECTORIES "${SPIRV_TOOLS_SOURCE_DIR}") + endif() endif() endif() From 27e01304b889df0829fe0ac28e2609a9ff835beb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 17:31:43 +0000 Subject: [PATCH 4/4] Remove trailing whitespace Co-authored-by: Duttenheim <6490176+Duttenheim@users.noreply.github.com> --- code/compiler/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/compiler/CMakeLists.txt b/code/compiler/CMakeLists.txt index 3a8730f..00e5ad2 100644 --- a/code/compiler/CMakeLists.txt +++ b/code/compiler/CMakeLists.txt @@ -36,7 +36,7 @@ if((SPIRV-Tools-opt_LIBRARY OR SPIRV-Tools-opt_DEBUG_LIBRARY) AND NOT TARGET SPI PROPERTY IMPORTED_LOCATION_DEBUG "${SPIRV-Tools-opt_DEBUG_LIBRARY}") endif() - + # Add SPIRV-Tools source directory to include paths if available # This is needed for some Vulkan SDK versions (e.g., 1.4.304.1) where # internal headers like pass_manager.h are referenced by public headers