Merge branch 'findSimilarInstancesOpt' into 'main'

[REMIX-3744] Small optimization to early out on exact transform match. See merge request lightspeedrtx/dxvk-remix-nv!1185
NVIDIAGameWorks · Nov 26, 2024 · 3d42d5e · 3d42d5e
2 parents b4ca5f6 + fd7a965
commit 3d42d5e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/src/dxvk/rtx_render/rtx_instance_manager.cpp b/src/dxvk/rtx_render/rtx_instance_manager.cpp
@@ -652,17 +652,24 @@ namespace dxvk {
 
     // Search the BLAS for an instance matching ours
     {
-      const auto adjacentCells = blas.getSpatialMap().getDataNearPos(worldPosition);
-      for (const std::vector<const RtInstance*>* cellPtr : adjacentCells){
-        for (const RtInstance* instance : *cellPtr) {
-          if (instance->m_frameLastUpdated == currentFrameIdx) {
-            // If the transform is an exact match and the instance has already been touched this frame,
-            // then this is a second draw call on a single mesh.
+      // Search for an exact match
+      const std::vector<const RtInstance*>* matchingCell = blas.getSpatialMap().getDataAtPos(worldPosition);
+      if (matchingCell != nullptr) {
+        for (const RtInstance* instance : *matchingCell) {
             const Matrix4 instanceTransform = instance->getTransform();
+            // Note: this may be the second call this frame targetting the same instance.
             if (memcmp(&transform, &instanceTransform, sizeof(instanceTransform)) == 0) {
               return const_cast<RtInstance*>(instance);
             }
-          } else if (instance->m_materialHash == material.getHash()) {
+        }
+      }
+
+      // No exact match, so find the closest match in the region
+      // (need to check a 2x2x2 patch of cells to account for positions close to a border)
+      const auto adjacentCells = blas.getSpatialMap().getDataNearPos(worldPosition);
+      for (const std::vector<const RtInstance*>* cellPtr : adjacentCells){
+        for (const RtInstance* instance : *cellPtr) {
+          if (instance->m_frameLastUpdated != currentFrameIdx && instance->m_materialHash == material.getHash()) {
             // Instance hasn't been touched yet this frame.
 
             const Vector3& prevInstanceWorldPosition = instance->getSpatialCachePosition();

diff --git a/src/util/util_spatial_map.h b/src/util/util_spatial_map.h
@@ -45,6 +45,15 @@ namespace dxvk {
       return *this;
     }
 
+    // returns the cell closest to `position`
+    const std::vector<T>* getDataAtPos(const Vector3& position) const {
+      auto pair = m_cache.find(getCellPos(position));
+      if ( pair != m_cache.end()) {
+        return &pair->second;
+      }
+      return nullptr;
+    }
+
     // returns the 8 cells closest to `position`
     const std::vector<const std::vector<T>*> getDataNearPos(const Vector3& position) const {
       static const std::array kOffsets{