Merge branch 'replacement-instance-fix-5' into 'main'

Prevent subPrim instances from being returned when searching for root instances.

See merge request lightspeedrtx/dxvk-remix-nv!1677

Author: MarkEHenderson

src/dxvk/rtx_render/rtx_instance_manager.cpp

@@ -800,7 +800,11 @@ namespace dxvk {
       // (need to check a 2x2x2 patch of cells to account for positions close to a border)
       result = const_cast<RtInstance*>(blas.getSpatialMap().getNearestData(worldPosition, uniqueObjectDistanceSqr, nearestDistSqr,
         [&] (const RtInstance* instance) {
-          return instance->m_frameLastUpdated != currentFrameIdx && instance->m_materialHash == material.getHash();
+          // Filter out instances by returning false if the instance:
+          // - has already been updated this frame
+          // - doesn't use the same material
+          // - is a sub prim of a replacement instance
+          return instance->m_frameLastUpdated != currentFrameIdx && instance->m_materialHash == material.getHash() && !instance->m_primInstanceOwner.isSubPrim();
         }
       ));
       if (nearestDistSqr == 0.0f && result != nullptr) {

src/dxvk/rtx_render/rtx_types.h

@@ -155,6 +155,14 @@ class PrimInstanceOwner {
   ReplacementInstance* getOrCreateReplacementInstance(void* owner, PrimInstance::Type type, size_t index, size_t numPrims);
   ReplacementInstance* getReplacementInstance() const { return m_replacementInstance; }
   size_t getReplacementIndex() const { return m_replacementIndex; }
+  bool isSubPrim() const {
+    if (m_replacementInstance == nullptr) {
+      return false;
+    } else {
+      return m_replacementIndex != ReplacementInstance::kInvalidReplacementIndex &&
+        m_replacementInstance->root.getUntyped() != m_replacementInstance->prims[m_replacementIndex].getUntyped();
+    }
+  }
 private:
   ReplacementInstance* m_replacementInstance = nullptr;
   size_t m_replacementIndex = ReplacementInstance::kInvalidReplacementIndex;