HdRenderDelegateInfo: moving it into own file adding helper to HdLegacyRenderControl so that clients do not need to construct HdRenderDelegateInfo itself.

(Internal change: 2383553)
(Internal change: 2383598)

Author: unhyperbolic

pxr/imaging/hd/CMakeLists.txt

@@ -103,6 +103,7 @@ pxr_library(hd
         legacyDisplayStyleSchema
         legacyGeomSubsetSceneIndex
         legacyPrimSceneIndex
+        legacyRenderControlInterface
         legacyTaskFactory
         legacyTaskSchema
         lensDistortionSchema
@@ -222,7 +223,7 @@ pxr_library(hd
         driver.h
         invalidatableContainerDataSource.h
         materialNetworkInterface.h
-        legacyRenderControlInterface.h
+        renderDelegateInfo.h
         rendererCreateArgs.h
         schemaTypeDefs.h
         vectorSchemaTypeDefs.h

pxr/imaging/hd/legacyRenderControlInterface.cpp

@@ -0,0 +1,29 @@
+//
+// Copyright 2025 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/imaging/hd/legacyRenderControlInterface.h"
+
+#include "pxr/imaging/hd/renderDelegateInfo.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdRenderDelegateInfo
+HdLegacyRenderControlInterface::GetRenderDelegateInfo() const
+{
+    HdRenderDelegateInfo info;
+
+    info.materialBindingPurpose = GetMaterialBindingPurpose();
+    info.materialRenderContexts = GetMaterialRenderContexts();
+    info.renderSettingsNamespaces = GetRenderSettingsNamespaces();
+    info.isPrimvarFilteringNeeded = IsPrimvarFilteringNeeded();
+    info.shaderSourceTypes = GetShaderSourceTypes();
+    info.isCoordSysSupported = IsCoordSysSupported();
+
+    return info;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE

pxr/imaging/hd/legacyRenderControlInterface.h

@@ -9,11 +9,15 @@
 
 #include "pxr/pxr.h"
 
+#include "pxr/imaging/hd/api.h"
+
 #include "pxr/imaging/hd/aov.h"
+#include "pxr/imaging/hd/command.h"
 #include "pxr/usd/sdf/path.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
+struct HdRenderDelegateInfo;
 class HdRenderBuffer;
 using HdRenderSettingDescriptorList =
     std::vector<struct HdRenderSettingDescriptor>;
@@ -106,11 +110,12 @@ class HdLegacyRenderControlInterface
     virtual TfTokenVector GetRenderSettingsNamespaces() const = 0;
     virtual bool IsPrimvarFilteringNeeded() const = 0;
     virtual TfTokenVector GetShaderSourceTypes() const = 0;
-
     /// This is for UsdImagingDelegate::_coordSysEnabled that has a
     /// surprising performance impact.
     virtual bool IsCoordSysSupported() const = 0;
 
+    HD_API
+    HdRenderDelegateInfo GetRenderDelegateInfo() const;
     /// @}
 
     /// \name Misc

pxr/imaging/hd/renderDelegateInfo.h

@@ -0,0 +1,27 @@
+//
+// Copyright 2025 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_IMAGING_HD_RENDER_DELEGATE_INFO_H
+#define PXR_IMAGING_HD_RENDER_DELEGATE_INFO_H
+
+#include "pxr/base/tf/token.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdRenderDelegate;
+
+struct HdRenderDelegateInfo
+{
+    TfToken materialBindingPurpose;
+    TfTokenVector materialRenderContexts;
+    TfTokenVector renderSettingsNamespaces;
+    bool isPrimvarFilteringNeeded;
+    TfTokenVector shaderSourceTypes;
+    bool isCoordSysSupported;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+#endif

pxr/imaging/hd/renderIndexAdapterSceneIndex.cpp

@@ -8,6 +8,7 @@
 #include "pxr/imaging/hd/renderIndexAdapterSceneIndex.h"
 
 #include "pxr/imaging/hd/renderDelegate.h"
+#include "pxr/imaging/hd/renderDelegateInfo.h"
 #include "pxr/imaging/hd/renderIndex.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -43,7 +44,7 @@ class _NullRenderDelegateForAdapter : public HdRenderDelegate
 {
 public:
     _NullRenderDelegateForAdapter(
-        const HdRenderIndexAdapterSceneIndex::RenderDelegateInfo &info)
+        const HdRenderDelegateInfo &info)
      : _info(info)
     {
     }
@@ -119,13 +120,13 @@ class _NullRenderDelegateForAdapter : public HdRenderDelegate
     void CommitResources(HdChangeTracker*) override {}
 
 private:
-    const HdRenderIndexAdapterSceneIndex::RenderDelegateInfo _info;
+    const HdRenderDelegateInfo _info;
 };
 
 }
 
 HdRenderIndexAdapterSceneIndex::HdRenderIndexAdapterSceneIndex(
-    const RenderDelegateInfo &info)
+    const HdRenderDelegateInfo &info)
  : _renderDelegate(std::make_unique<_NullRenderDelegateForAdapter>(info))
  , _renderIndex(HdRenderIndex::New(_renderDelegate.get()))
  , _observer(this)

pxr/imaging/hd/renderIndexAdapterSceneIndex.h

@@ -15,6 +15,7 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 class HdRenderDelegate;
 class HdRenderIndex;
+struct HdRenderDelegateInfo;
 TF_DECLARE_REF_PTRS(HdRenderIndexAdapterSceneIndex);
 
 /// \class HdRenderIndexAdapterSceneIndex
@@ -26,18 +27,8 @@ TF_DECLARE_REF_PTRS(HdRenderIndexAdapterSceneIndex);
 class HdRenderIndexAdapterSceneIndex : public HdSceneIndexBase
 {
 public:
-    struct RenderDelegateInfo
-    {
-        TfToken materialBindingPurpose;
-        TfTokenVector materialRenderContexts;
-        TfTokenVector renderSettingsNamespaces;
-        bool isPrimvarFilteringNeeded;
-        TfTokenVector shaderSourceTypes;
-        bool isCoordSysSupported;
-    };
-
     static HdRenderIndexAdapterSceneIndexRefPtr New(
-        const RenderDelegateInfo &info)
+        const HdRenderDelegateInfo &info)
     {
         return TfCreateRefPtr(new HdRenderIndexAdapterSceneIndex(info));
     }
@@ -55,7 +46,7 @@ class HdRenderIndexAdapterSceneIndex : public HdSceneIndexBase
 
 private:
     HD_API
-    HdRenderIndexAdapterSceneIndex(const RenderDelegateInfo &info);
+    HdRenderIndexAdapterSceneIndex(const HdRenderDelegateInfo &info);
 
     std::unique_ptr<HdRenderDelegate> const _renderDelegate;
     std::unique_ptr<HdRenderIndex> const _renderIndex;

pxr/usdImaging/usdImagingGL/engine.cpp

@@ -26,6 +26,7 @@
 #include "pxr/imaging/hd/noticeBatchingSceneIndex.h"
 #include "pxr/imaging/hd/prefixingSceneIndex.h"
 #include "pxr/imaging/hd/renderBuffer.h"
+#include "pxr/imaging/hd/renderDelegateInfo.h"
 #include "pxr/imaging/hd/renderIndexAdapterSceneIndex.h"
 #include "pxr/imaging/hd/renderer.h"
 #include "pxr/imaging/hd/rendererCreateArgsSchema.h"
@@ -1723,22 +1724,11 @@ UsdImagingGLEngine::_CreateSceneIndicesAndRenderer(HdRendererPluginHandle const
     } else {
         TRACE_SCOPE("UsdImaging scene delegate");
 
-        HdRenderIndexAdapterSceneIndex::RenderDelegateInfo info;
+        HdRenderDelegateInfo info;
 
         if (HdLegacyRenderControlInterface * const renderControl =
                 _renderer->GetLegacyRenderControl()) {
-            info.materialBindingPurpose =
-                renderControl->GetMaterialBindingPurpose();
-            info.materialRenderContexts =
-                renderControl->GetMaterialRenderContexts();
-            info.renderSettingsNamespaces =
-                renderControl->GetRenderSettingsNamespaces();
-            info.isPrimvarFilteringNeeded =
-                renderControl->IsPrimvarFilteringNeeded();
-            info.shaderSourceTypes =
-                renderControl->GetShaderSourceTypes();
-            info.isCoordSysSupported =
-                renderControl->IsCoordSysSupported();
+            info = renderControl->GetRenderDelegateInfo();
         }
 
         auto const adapter =