Merge pull request #1810 from DuncanHopkinsFoundry/MR/NDRAccessor

Add the AppendDiscoveryResult to NdrRegistry

(Internal change: 2238369)

pxr/usd/ndr/registry.cpp

@@ -353,6 +353,20 @@ NdrRegistry::SetExtraDiscoveryPlugins(const std::vector<TfType>& pluginTypes)
     SetExtraDiscoveryPlugins(std::move(discoveryPlugins));
 }
 
+void NdrRegistry::AddDiscoveryResult(NdrNodeDiscoveryResult&& discoveryResult)
+{
+    std::lock_guard<std::mutex> drLock(_discoveryResultMutex);
+    _AddDiscoveryResultNoLock(std::move(discoveryResult));
+}
+
+void NdrRegistry::AddDiscoveryResult(const NdrNodeDiscoveryResult& discoveryResult)
+{
+    // Explicitly create a copy, otherwise this method will recurse
+    // into itself.
+    NdrNodeDiscoveryResult result = discoveryResult;
+    AddDiscoveryResult(std::move(result));
+}
+
 void
 NdrRegistry::SetExtraParserPlugins(const std::vector<TfType>& pluginTypes)
 {

pxr/usd/ndr/registry.h

@@ -86,6 +86,23 @@ class NdrRegistry : public TfWeakBase
     NDR_API
     void SetExtraDiscoveryPlugins(const std::vector<TfType>& pluginTypes);
 
+    /// Allows the client to explicitly set additional discovery results that
+    /// would otherwise NOT be found through the plugin system. For example
+    /// to support lazily-loaded plugins which cannot be easily discovered
+    /// in advance.
+    ///
+    /// This method will not immediately spawn a parse call which will be
+    /// deferred until a GetNode*() method is called.
+    NDR_API
+    void AddDiscoveryResult(NdrNodeDiscoveryResult&& discoveryResult);
+
+    /// Copy version of the method above.
+    /// For performance reasons, one should prefer to use the rvalue reference
+    /// form.
+    /// \overload
+    NDR_API
+    void AddDiscoveryResult(const NdrNodeDiscoveryResult& discoveryResult);
+
     /// Allows the client to set any additional parser plugins that would
     /// otherwise NOT be found through the plugin system.
     ///