Merge branch 'PrimTargetFix' into 'main'

[REMIX-4845] properly handle unset target properties in components

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

Author: MarkEHenderson

src/dxvk/rtx_render/graph/rtx_graph_batch.cpp

@@ -120,18 +120,18 @@ void RtGraphBatch::Initialize(const RtGraphTopology& topology) {
   m_graphHash = topology.graphHash;
 }
 
-void RtGraphBatch::addInstance(Rc<DxvkContext> context, const RtGraphState& initialGraphState, GraphInstance* graphInstance) {
+bool RtGraphBatch::addInstance(Rc<DxvkContext> context, const RtGraphState& initialGraphState, GraphInstance* graphInstance) {
   ScopedCpuProfileZone();
   if (graphInstance == nullptr) {
     Logger::err("Cannot add null GraphInstance");
-    return;
+    return false;
   }
 
   if (initialGraphState.values.size() != m_properties.size()) {
     Logger::err(str::format("RtGraphState had the wrong number of values. Expected: ",
                             m_properties.size(), " got: ", initialGraphState.values.size()));
     assert(false && "RtGraphState had the wrong number of values.");
-    return;
+    return false;
   }
 
   graphInstance->setBatchIndex(m_graphInstances.size());
@@ -150,10 +150,10 @@ void RtGraphBatch::addInstance(Rc<DxvkContext> context, const RtGraphState& init
       }, initialGraphState.values[i]);
     }
     catch (const std::bad_variant_access& e) {
-      Logger::err(str::format("Type mismatch when adding instance to property ", i, ": ", e.what()));
+      Logger::err(str::format("Graph ", initialGraphState.primPath, " had a type mismatch when adding instance to property ", i, ": ", e.what()));
       // Remove the instance we just added
       m_graphInstances.pop_back();
-      return;
+      return false;
     }
   }
 
@@ -167,6 +167,7 @@ void RtGraphBatch::addInstance(Rc<DxvkContext> context, const RtGraphState& init
     }
     batch->updateRange(context, newInstanceIndex, newInstanceIndex + 1);
   }
+  return true;
 }
 
 void RtGraphBatch::removeInstance(GraphInstance* graphInstance) {

src/dxvk/rtx_render/graph/rtx_graph_batch.h

@@ -44,7 +44,7 @@ class RtGraphBatch {
 
   void Initialize(const RtGraphTopology& topology);
 
-  void addInstance(Rc<DxvkContext> context, const RtGraphState& graphState, GraphInstance* replacementInstance);
+  bool addInstance(Rc<DxvkContext> context, const RtGraphState& graphState, GraphInstance* replacementInstance);
 
   void removeInstance(GraphInstance* graphInstance);
 

src/dxvk/rtx_render/graph/rtx_graph_gui.cpp

@@ -450,7 +450,13 @@ std::string RtxGraphGUI::formatPropertyValue(const RtComponentPropertyValue& val
     } else if constexpr (std::is_same_v<T, std::string>) {
       return "\"" + v + "\"";
     } else if constexpr (std::is_same_v<T, PrimTarget>) {
-      return "instance: " + std::to_string(v.instanceId) + ", index: " + std::to_string(v.replacementIndex);
+      if (v.instanceId == kInvalidInstanceId) {
+        return "Invalid instance";
+      } else if (v.replacementIndex == ReplacementInstance::kInvalidReplacementIndex) {
+        return "Invalid replacement index";
+      } else {
+        return "instance: " + std::to_string(v.instanceId) + ", index: " + std::to_string(v.replacementIndex);
+      }
     } else {
       return "Unknown";
     }

src/dxvk/rtx_render/graph/rtx_graph_manager.h

@@ -71,10 +71,14 @@ class GraphManager {
     uint64_t instanceId = m_nextInstanceId++;
     auto pair = m_graphInstances.try_emplace(instanceId, this, graphState.topology.graphHash, 0, instanceId, graphState);
     if (!pair.second) {
-      Logger::err(str::format("GraphInstance already exists. Instance: ", instanceId));
+      Logger::err(str::format("GraphInstance already exists. Instance: ", instanceId, " Prim path: ", graphState.primPath));
+      return nullptr;
+    }
+    if (!iter->second.addInstance(context, graphState, &pair.first->second)) {
+      m_graphInstances.erase(instanceId);
+      Logger::err(str::format("Failed to add GraphInstance to GraphBatch. Instance: ", instanceId, " Prim path: ", graphState.primPath));
       return nullptr;
     }
-    iter->second.addInstance(context, graphState, &pair.first->second);
     return &pair.first->second;
   }
 

src/dxvk/rtx_render/graph/rtx_graph_usd_parser.cpp

@@ -764,13 +764,13 @@ RtComponentPropertyValue GraphUsdParser::getPropertyValue(const pxr::UsdRelation
         }
       }
       return propertyValueForceType<PrimTarget>(result);
-    } else {
+    } else if (targets.size() > 1) {
       Logger::err(str::format("Relationship ", rel.GetPath().GetString(), " has multiple targets, which is not supported."));
     }
   }
   // Note: this intentionally ignores the default value - if the relationship isn't connected,
   // we need to use kInvalidReplacementIndex.
-  return ReplacementInstance::kInvalidReplacementIndex;
+  return PrimTarget{ ReplacementInstance::kInvalidReplacementIndex, kInvalidInstanceId };
 }
 
 RtComponentPropertyValue GraphUsdParser::getPropertyValue(const pxr::UsdAttribute& attr, const RtComponentPropertySpec& spec, PathToOffsetMap& pathToOffsetMap) {