From c872a2c24eaae18de27a41d3226b0fbd4bdac557 Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Fri, 18 Oct 2024 17:23:42 -0700
Subject: [PATCH] Hydrogent: moved HnTextureRegistry.hpp and HnGeometryPool.hpp
 from interface to include

---
 Hydrogent/CMakeLists.txt                              |  4 ++--
 Hydrogent/{interface => include}/HnGeometryPool.hpp   |  0
 .../{interface => include}/HnTextureRegistry.hpp      |  0
 Hydrogent/interface/HnRenderDelegate.hpp              |  6 +++---
 Hydrogent/src/HnRenderDelegate.cpp                    | 11 +++++++++--
 5 files changed, 14 insertions(+), 7 deletions(-)
 rename Hydrogent/{interface => include}/HnGeometryPool.hpp (100%)
 rename Hydrogent/{interface => include}/HnTextureRegistry.hpp (100%)

diff --git a/Hydrogent/CMakeLists.txt b/Hydrogent/CMakeLists.txt
index 3dd71890..35e81dee 100644
--- a/Hydrogent/CMakeLists.txt
+++ b/Hydrogent/CMakeLists.txt
@@ -61,6 +61,8 @@ set(INCLUDE
     include/HnTextureUtils.hpp
     include/HnMeshUtils.hpp
     include/HnTextureIdentifier.hpp
+    include/HnTextureRegistry.hpp
+    include/HnGeometryPool.hpp
     include/Computations/HnExtComputationImpl.hpp
     include/Computations/HnSkinningComputation.hpp
 )
@@ -81,8 +83,6 @@ set(INTERFACE
     interface/HnFrameRenderTargets.hpp
     interface/HnTokens.hpp
     interface/HnTypes.hpp
-    interface/HnTextureRegistry.hpp
-    interface/HnGeometryPool.hpp
     interface/Tasks/HnTask.hpp
     interface/Tasks/HnCopySelectionDepthTask.hpp
     interface/Tasks/HnBeginFrameTask.hpp
diff --git a/Hydrogent/interface/HnGeometryPool.hpp b/Hydrogent/include/HnGeometryPool.hpp
similarity index 100%
rename from Hydrogent/interface/HnGeometryPool.hpp
rename to Hydrogent/include/HnGeometryPool.hpp
diff --git a/Hydrogent/interface/HnTextureRegistry.hpp b/Hydrogent/include/HnTextureRegistry.hpp
similarity index 100%
rename from Hydrogent/interface/HnTextureRegistry.hpp
rename to Hydrogent/include/HnTextureRegistry.hpp
diff --git a/Hydrogent/interface/HnRenderDelegate.hpp b/Hydrogent/interface/HnRenderDelegate.hpp
index 0cdea51d..ced58bf2 100644
--- a/Hydrogent/interface/HnRenderDelegate.hpp
+++ b/Hydrogent/interface/HnRenderDelegate.hpp
@@ -43,7 +43,6 @@
 
 #include "entt/entity/registry.hpp"
 
-#include "HnGeometryPool.hpp"
 #include "HnTypes.hpp"
 
 namespace Diligent
@@ -63,6 +62,7 @@ class HnLight;
 class HnRenderParam;
 class HnShadowMapManager;
 class HnTextureRegistry;
+class HnGeometryPool;
 
 /// Memory usage statistics of the render delegate.
 struct HnRenderDelegateMemoryStats
@@ -365,7 +365,7 @@ class HnRenderDelegate final : public pxr::HdRenderDelegate
     virtual bool IsParallelSyncEnabled(pxr::TfToken primType) const override final;
 
     HnTextureRegistry&  GetTextureRegistry() { return *m_TextureRegistry; }
-    HnGeometryPool&     GetGeometryPool() { return m_GeometryPool; }
+    HnGeometryPool&     GetGeometryPool() { return *m_GeometryPool; }
     HnShadowMapManager* GetShadowMapManager() const { return m_ShadowMapManager.get(); }
 
     const pxr::SdfPath* GetRPrimId(Uint32 UID) const;
@@ -435,7 +435,7 @@ class HnRenderDelegate final : public pxr::HdRenderDelegate
     Uint32 m_ShadowPassFrameAttribsAlignedSize = 0;
 
     std::shared_ptr<HnTextureRegistry>  m_TextureRegistry;
-    HnGeometryPool                      m_GeometryPool;
+    std::unique_ptr<HnGeometryPool>     m_GeometryPool;
     std::unique_ptr<HnRenderParam>      m_RenderParam;
     std::unique_ptr<HnShadowMapManager> m_ShadowMapManager;
 
diff --git a/Hydrogent/src/HnRenderDelegate.cpp b/Hydrogent/src/HnRenderDelegate.cpp
index efa86a77..1ca35213 100644
--- a/Hydrogent/src/HnRenderDelegate.cpp
+++ b/Hydrogent/src/HnRenderDelegate.cpp
@@ -35,6 +35,7 @@
 #include "HnFrameRenderTargets.hpp"
 #include "HnShadowMapManager.hpp"
 #include "HnTextureRegistry.hpp"
+#include "HnGeometryPool.hpp"
 
 #include "DebugUtilities.hpp"
 #include "GraphicsUtilities.h"
@@ -340,7 +341,13 @@ HnRenderDelegate::HnRenderDelegate(const CreateInfo& CI) :
                 CI.TextureLoadBudget,
             }),
     },
-    m_GeometryPool{CI.pDevice, *m_ResourceMgr, CI.UseVertexPool, CI.UseIndexPool},
+    m_GeometryPool{
+        std::make_unique<HnGeometryPool>(
+            CI.pDevice,
+            *m_ResourceMgr,
+            CI.UseVertexPool,
+            CI.UseIndexPool),
+    },
     m_RenderParam{
         std::make_unique<HnRenderParam>(
             CI.UseVertexPool,
@@ -581,7 +588,7 @@ void HnRenderDelegate::CommitResources(pxr::HdChangeTracker* tracker)
     m_ResourceMgr->UpdateIndexBuffer(m_pDevice, m_pContext);
 
     m_TextureRegistry->Commit(m_pContext);
-    m_GeometryPool.Commit(m_pContext);
+    m_GeometryPool->Commit(m_pContext);
     if (m_ShadowMapManager)
     {
         m_ShadowMapManager->Commit(m_pDevice, m_pContext);