From b8cd4a7c487280b4f28a10945e013bb02d1c4bbb Mon Sep 17 00:00:00 2001 From: ZilverBlade <90721817+ZilverBlade@users.noreply.github.com> Date: Fri, 5 Dec 2025 15:49:26 +0100 Subject: [PATCH 1/2] removed compile commands and updated submodules --- CMakeLists.txt | 23 ----------------------- vendor/PyroPlatform | 2 +- vendor/PyroRHI | 2 +- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b62a943..2eddb5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,26 +34,3 @@ add_subdirectory(ShockGraph) if(SHOCKGRAPH_BUILD_VISUAL_TESTS) add_subdirectory(VisualTests) endif() - - -set(COMPILE_COMMANDS_FILE "${CMAKE_BINARY_DIR}/compile_commands.json") -set(DESTINATION_FILE "${CMAKE_SOURCE_DIR}/compile_commands.json") - -if(EXISTS "${CMAKE_BINARY_DIR}/compile_commands.json") - # Add a custom command to copy compile_commands.json after the build - add_custom_command(OUTPUT "${CMAKE_SOURCE_DIR}/compile_commands.json" - COMMAND ${CMAKE_COMMAND} -E copy - "${CMAKE_BINARY_DIR}/compile_commands.json" - "${CMAKE_SOURCE_DIR}" - DEPENDS "${CMAKE_BINARY_DIR}/compile_commands.json" - COMMENT "Copying compile_commands.json to source directory" - ) - - # Make sure the custom command runs as part of the build. This attaches the - # command to the ALL target, meaning it runs every time you build the project. - add_custom_target(CopyCompileCommands ALL - DEPENDS "${CMAKE_SOURCE_DIR}/compile_commands.json" - ) -else() - message(STATUS "compile_commands.json not found in build directory. Skipping copy.") -endif() diff --git a/vendor/PyroPlatform b/vendor/PyroPlatform index e45ecb7..5721aea 160000 --- a/vendor/PyroPlatform +++ b/vendor/PyroPlatform @@ -1 +1 @@ -Subproject commit e45ecb74027cf3a9e9d97aa8815a4af48cc4013d +Subproject commit 5721aeab8cf06bd3c9932663ce44750faa34e6b3 diff --git a/vendor/PyroRHI b/vendor/PyroRHI index 25c0c14..580bee7 160000 --- a/vendor/PyroRHI +++ b/vendor/PyroRHI @@ -1 +1 @@ -Subproject commit 25c0c14e9fabe7a468efd28884d4250189bab136 +Subproject commit 580bee73b92538300bb779e01324c1647185d8c7 From 373c43837170d608abd4c252b721657a3f0d9f81 Mon Sep 17 00:00:00 2001 From: ZilverBlade <90721817+ZilverBlade@users.noreply.github.com> Date: Tue, 20 Jan 2026 09:59:42 +0100 Subject: [PATCH 2/2] fix issue where reusing tasks contains old references --- ShockGraph/TaskGraph.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ShockGraph/TaskGraph.cpp b/ShockGraph/TaskGraph.cpp index 84db623..4fcb65a 100644 --- a/ShockGraph/TaskGraph.cpp +++ b/ShockGraph/TaskGraph.cpp @@ -402,6 +402,13 @@ namespace PyroshockStudios { } mSwapChains.clear(); mInternalTasks.clear(); + // Make sure to reset tasks as these may require setup again! + for (auto& task : mTasks) { + auto& setupData = task->GetTask()->mSetupData; + setupData.accelerationStructureDepends.clear(); + setupData.bufferDepends.clear(); + setupData.imageDepends.clear(); + } mTasks.clear(); mBatches.clear(); mAllTaskRefs.clear();