From 27099311db47fe3695880f3c6b725996d2ebf3ed Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Thu, 26 Oct 2023 20:28:11 -0700
Subject: [PATCH] Hydrogent: fixed a few minor build issues

---
 Hydrogent/CMakeLists.txt                         | 1 +
 Hydrogent/interface/HnRenderDelegate.hpp         | 1 +
 Hydrogent/interface/Tasks/HnRenderRprimsTask.hpp | 2 +-
 Hydrogent/interface/Tasks/HnTaskManager.hpp      | 6 +++---
 Hydrogent/src/HnRenderPass.cpp                   | 2 +-
 Hydrogent/src/Tasks/HnRenderEnvMapTask.cpp       | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Hydrogent/CMakeLists.txt b/Hydrogent/CMakeLists.txt
index 1c856d45..c63a3065 100644
--- a/Hydrogent/CMakeLists.txt
+++ b/Hydrogent/CMakeLists.txt
@@ -110,6 +110,7 @@ INTERFACE
 if(MSVC)
     target_compile_definitions(USD_LIBS INTERFACE NOMINMAX)
     target_compile_options(USD_LIBS INTERFACE /wd4244 /wd4305 /wd4127 /wd4267)
+    target_compile_options(Diligent-Hydrogent PRIVATE /permissive-)
 endif()
 
 target_link_libraries(USD_LIBS
diff --git a/Hydrogent/interface/HnRenderDelegate.hpp b/Hydrogent/interface/HnRenderDelegate.hpp
index c0e2f32d..5da0428b 100644
--- a/Hydrogent/interface/HnRenderDelegate.hpp
+++ b/Hydrogent/interface/HnRenderDelegate.hpp
@@ -192,6 +192,7 @@ class HnRenderDelegate final : public pxr::HdRenderDelegate
     IDeviceContext*    GetDeviceContext() const { return m_pContext; }
     IRenderStateCache* GetRenderStateCache() const { return m_pRenderStateCache; }
     IBuffer*           GetCameraAttribsCB() const { return m_CameraAttribsCB; }
+    IBuffer*           GetLightAttribsCB() const { return m_LightAttribsCB; }
 
 private:
     static const pxr::TfTokenVector SupportedRPrimTypes;
diff --git a/Hydrogent/interface/Tasks/HnRenderRprimsTask.hpp b/Hydrogent/interface/Tasks/HnRenderRprimsTask.hpp
index d6392c32..86e4bdfe 100644
--- a/Hydrogent/interface/Tasks/HnRenderRprimsTask.hpp
+++ b/Hydrogent/interface/Tasks/HnRenderRprimsTask.hpp
@@ -96,7 +96,7 @@ class HnRenderRprimsTask final : public HnTask
 
     virtual void Execute(pxr::HdTaskContext* TaskCtx) override final;
 
-    const pxr::TfTokenVector& GetRenderTags() const
+    virtual const pxr::TfTokenVector& GetRenderTags() const override final
     {
         return m_RenderTags;
     }
diff --git a/Hydrogent/interface/Tasks/HnTaskManager.hpp b/Hydrogent/interface/Tasks/HnTaskManager.hpp
index adab91b3..37650795 100644
--- a/Hydrogent/interface/Tasks/HnTaskManager.hpp
+++ b/Hydrogent/interface/Tasks/HnTaskManager.hpp
@@ -154,7 +154,7 @@ class HnTaskManager
     const pxr::SdfPath  m_ManagerId;
 
     // Custom delegate to pass parameters to the render tasks.
-    class HnTaskManager::TaskParamsDelegate final : public pxr::HdSceneDelegate
+    class TaskParamsDelegate final : public pxr::HdSceneDelegate
     {
     public:
         TaskParamsDelegate(pxr::HdRenderIndex& Index,
@@ -236,7 +236,7 @@ class HnTaskManager
 template <typename ParamterType>
 void HnTaskManager::SetParameter(const pxr::SdfPath& TaskId, const pxr::TfToken& ValueKey, ParamterType&& Value)
 {
-    m_ParamsDelegate.SetParameter(TaskId, pxr::HdTokens->params, std::forward<TaskParamsType>(Params));
+    m_ParamsDelegate.SetParameter(TaskId, pxr::HdTokens->params, std::forward<ParamterType>(Value));
 }
 
 template <typename TaskType, typename TaskParamsType>
@@ -266,7 +266,7 @@ template <typename TaskParamsType>
 bool HnTaskManager::SetTaskParams(const pxr::SdfPath& TaskId,
                                   TaskParamsType&&    Params)
 {
-    auto OldParams = m_ParamsDelegate.GetParameter<std::remove_reference<TaskParamsType>::type>(TaskId, pxr::HdTokens->params);
+    auto OldParams = m_ParamsDelegate.GetParameter<typename std::remove_reference<TaskParamsType>::type>(TaskId, pxr::HdTokens->params);
     if (OldParams == Params)
         return false;
 
diff --git a/Hydrogent/src/HnRenderPass.cpp b/Hydrogent/src/HnRenderPass.cpp
index cfd1fa8f..b0791a5a 100644
--- a/Hydrogent/src/HnRenderPass.cpp
+++ b/Hydrogent/src/HnRenderPass.cpp
@@ -85,7 +85,7 @@ void HnRenderPass::_Execute(const pxr::HdRenderPassStateSharedPtr& RPState,
     pxr::HdRenderIndex* pRenderIndex    = GetRenderIndex();
     HnRenderDelegate*   pRenderDelegate = static_cast<HnRenderDelegate*>(pRenderIndex->GetRenderDelegate());
 
-    auto& USDRenderer = pRenderDelegate->GetUSDRenderer();
+    auto USDRenderer = pRenderDelegate->GetUSDRenderer();
     if (!USDRenderer)
     {
         UNEXPECTED("USD renderer is not initialized");
diff --git a/Hydrogent/src/Tasks/HnRenderEnvMapTask.cpp b/Hydrogent/src/Tasks/HnRenderEnvMapTask.cpp
index 36c34626..2ab23122 100644
--- a/Hydrogent/src/Tasks/HnRenderEnvMapTask.cpp
+++ b/Hydrogent/src/Tasks/HnRenderEnvMapTask.cpp
@@ -100,7 +100,7 @@ void HnRenderEnvMapTask::Execute(pxr::HdTaskContext* TaskCtx)
 
     HnRenderDelegate* pRenderDelegate = static_cast<HnRenderDelegate*>(m_RenderIndex->GetRenderDelegate());
 
-    auto& USDRenderer = pRenderDelegate->GetUSDRenderer();
+    auto USDRenderer = pRenderDelegate->GetUSDRenderer();
     if (!USDRenderer)
     {
         UNEXPECTED("USD renderer is not initialized");