Merge branch 'master' into sampler-concepts

# Conflicts:
#	examples_tests

Author: karimsayedre

CMakePresets.json

@@ -24,7 +24,12 @@
 				"NBL_CPACK_CI": "ON",
 				"GIT_FAIL_IF_NONZERO_EXIT": "OFF",
 				"NBL_DOCKER_DIND_BUILD": "ON",
-				"NBL_CE_PUBLISH_PORT": "10240"
+				"NBL_CE_PUBLISH_PORT": "10240",
+				"NSC_DEBUG_EDIF_FILE_BIT": "ON",
+				"NSC_DEBUG_EDIF_SOURCE_BIT": "OFF",
+				"NSC_DEBUG_EDIF_LINE_BIT": "OFF",
+				"NSC_DEBUG_EDIF_TOOL_BIT": "ON",
+				"NSC_DEBUG_EDIF_NON_SEMANTIC_BIT": "OFF"
 			}
 		},
 		{

cmake/common.cmake

@@ -1185,9 +1185,9 @@ define_property(TARGET PROPERTY NBL_MOUNT_POINT_DEFINES
 	BRIEF_DOCS "List of preprocessor defines with mount points"
 )
 
+option(NSC_DEBUG_EDIF_SOURCE_BIT "Add \"-fspv-debug=source\" to NSC Debug CLI" ON)
 option(NSC_DEBUG_EDIF_FILE_BIT "Add \"-fspv-debug=file\" to NSC Debug CLI" ON)
-option(NSC_DEBUG_EDIF_SOURCE_BIT "Add \"-fspv-debug=source\" to NSC Debug CLI" OFF)
-option(NSC_DEBUG_EDIF_LINE_BIT "Add \"-fspv-debug=line\" to NSC Debug CLI" OFF)
+option(NSC_DEBUG_EDIF_LINE_BIT "Add \"-fspv-debug=line\" to NSC Debug CLI" ON)
 option(NSC_DEBUG_EDIF_TOOL_BIT "Add \"-fspv-debug=tool\" to NSC Debug CLI" ON)
 option(NSC_DEBUG_EDIF_NON_SEMANTIC_BIT "Add \"-fspv-debug=vulkan-with-source\" to NSC Debug CLI" OFF)
 option(NSC_USE_DEPFILE "Generate depfiles for NSC custom commands" ON)
@@ -1235,23 +1235,23 @@ struct DeviceConfigCaps
 	)
 
 	if(NSC_DEBUG_EDIF_FILE_BIT)
-    	list(APPEND REQUIRED_OPTIONS $<$<CONFIG:Debug>:-fspv-debug=file>)
+    	list(APPEND REQUIRED_OPTIONS $<$<CONFIG:Debug,RelWithDebInfo>:-fspv-debug=file>)
 	endif()
-	
+
 	if(NSC_DEBUG_EDIF_SOURCE_BIT)
-	    list(APPEND REQUIRED_OPTIONS $<$<CONFIG:Debug>:-fspv-debug=source>)
+	    list(APPEND REQUIRED_OPTIONS $<$<CONFIG:Debug,RelWithDebInfo>:-fspv-debug=source>)
 	endif()
-	
+
 	if(NSC_DEBUG_EDIF_LINE_BIT)
-	    list(APPEND REQUIRED_OPTIONS $<$<CONFIG:Debug>:-fspv-debug=line>)
+	    list(APPEND REQUIRED_OPTIONS $<$<CONFIG:Debug,RelWithDebInfo>:-fspv-debug=line>)
 	endif()
-	
+
 	if(NSC_DEBUG_EDIF_TOOL_BIT)
-	    list(APPEND REQUIRED_OPTIONS $<$<CONFIG:Debug>:-fspv-debug=tool>)
+	    list(APPEND REQUIRED_OPTIONS $<$<CONFIG:Debug,RelWithDebInfo>:-fspv-debug=tool>)
 	endif()
-	
+
 	if(NSC_DEBUG_EDIF_NON_SEMANTIC_BIT)
-	    list(APPEND REQUIRED_OPTIONS $<$<CONFIG:Debug>:-fspv-debug=vulkan-with-source>)
+	    list(APPEND REQUIRED_OPTIONS $<$<CONFIG:Debug,RelWithDebInfo>:-fspv-debug=vulkan-with-source>)
 	endif()
 
 	if(NOT NBL_EMBED_BUILTIN_RESOURCES)

examples_tests

@@ -503,6 +503,13 @@ class IGPUTopLevelAccelerationStructure : public asset::ITopLevelAccelerationStr
 					return oit;
 				}
 
+				// to get the section that `trackedBLASes` get written into
+				template<typename ForwardIterator> // TODO: requires
+				inline ForwardIterator getBLASTrackingOffset(ForwardIterator begin) const
+				{
+					return begin+(Base::isUpdate ? 4:3);
+				}
+
 
 				core::bitflag<BUILD_FLAGS> buildFlags = BUILD_FLAGS::PREFER_FAST_BUILD_BIT;
 				// What we use to indicate `VkAccelerationStructureGeometryInstancesDataKHR::arrayOfPointers`

include/nbl/video/IGPUAccelerationStructure.h

@@ -812,7 +812,7 @@ uint32_t IGPUCommandBuffer::buildAccelerationStructures_common(const std::span<c
     {
         // we still need to clear the BLAS tracking list if the TLAS has nothing to track, so add even if trackedBLASes.empty()
         if constexpr (std::is_same_v<DeviceBuildInfo,IGPUTopLevelAccelerationStructure::DeviceBuildInfo>)
-            m_TLASTrackingOps.emplace_back(TLASTrackingWrite{.srcBegin=oit,.count=static_cast<uint32_t>(info.trackedBLASes.size()),.dst=info.dstAS});
+            m_TLASTrackingOps.emplace_back(TLASTrackingWrite{.srcBegin=info.getBLASTrackingOffset(oit),.count=static_cast<uint32_t>(info.trackedBLASes.size()),.dst=info.dstAS});
         oit = info.fillTracking(oit);
     }