ProxyPipelineState: keep a copy of PSO desc

TheMostDiligent · TheMostDiligent · commit 7313cc6879f2 · 2025-01-08T22:29:10.000-08:00
diff --git a/Graphics/GraphicsTools/include/AsyncPipelineState.hpp b/Graphics/GraphicsTools/include/AsyncPipelineState.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2024 Diligent Graphics LLC
+ *  Copyright 2024-2025 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -82,7 +82,6 @@ class AsyncPipelineState final : public ProxyPipelineState<ObjectBase<IPipelineS
 
     RefCntAutoPtr<RenderStateCacheImpl>    m_pStateCache;
     std::unique_ptr<CreateInfoWrapperBase> m_pCreateInfo;
-    const PIPELINE_TYPE                    m_Type;
     UniqueIdHelper<AsyncPipelineState>     m_UniqueID;
 };
 
diff --git a/Graphics/GraphicsTools/include/ProxyPipelineState.hpp b/Graphics/GraphicsTools/include/ProxyPipelineState.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2024 Diligent Graphics LLC
+ *  Copyright 2024-2025 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 
 #include "PipelineState.h"
 #include "RefCntAutoPtr.hpp"
+#include "PipelineStateBase.hpp"
 
 namespace Diligent
 {
@@ -42,15 +43,15 @@ class ProxyPipelineState : public Base
 {
 public:
     template <typename... Args>
-    ProxyPipelineState(Args&&... args) :
-        Base{std::forward<Args>(args)...}
+    ProxyPipelineState(const PipelineStateDesc& PSODesc, Args&&... args) :
+        Base{std::forward<Args>(args)...},
+        m_Name{PSODesc.Name != nullptr ? PSODesc.Name : ""},
+        m_Desc{m_Name.c_str(), PSODesc.PipelineType}
     {}
 
     virtual const PipelineStateDesc& DILIGENT_CALL_TYPE GetDesc() const override
     {
-        DEV_CHECK_ERR(m_pPipeline, "Internal pipeline is null");
-        static constexpr PipelineStateDesc NullDesc;
-        return m_pPipeline ? m_pPipeline->GetDesc() : NullDesc;
+        return m_pPipeline ? m_pPipeline->GetDesc() : m_Desc;
     }
 
     virtual Int32 DILIGENT_CALL_TYPE GetUniqueID() const override
@@ -62,7 +63,10 @@ class ProxyPipelineState : public Base
     virtual void DILIGENT_CALL_TYPE SetUserData(IObject* pUserData) override
     {
         DEV_CHECK_ERR(m_pPipeline, "Internal pipeline is null");
-        m_pPipeline->SetUserData(pUserData);
+        if (m_pPipeline)
+        {
+            m_pPipeline->SetUserData(pUserData);
+        }
     }
 
     virtual IObject* DILIGENT_CALL_TYPE GetUserData() const override
@@ -104,7 +108,7 @@ class ProxyPipelineState : public Base
     virtual Uint32 DILIGENT_CALL_TYPE GetStaticVariableCount(SHADER_TYPE ShaderType) const override
     {
         DEV_CHECK_ERR(m_pPipeline, "Internal pipeline is null");
-        return m_pPipeline->GetStaticVariableCount(ShaderType);
+        return m_pPipeline ? m_pPipeline->GetStaticVariableCount(ShaderType) : 0;
     }
 
     virtual IShaderResourceVariable* DILIGENT_CALL_TYPE GetStaticVariableByName(SHADER_TYPE ShaderType, const Char* Name) override
@@ -122,7 +126,10 @@ class ProxyPipelineState : public Base
     virtual void DILIGENT_CALL_TYPE CreateShaderResourceBinding(IShaderResourceBinding** ppShaderResourceBinding, bool InitStaticResources) override
     {
         DEV_CHECK_ERR(m_pPipeline, "Internal pipeline is null");
-        m_pPipeline->CreateShaderResourceBinding(ppShaderResourceBinding, InitStaticResources);
+        if (m_pPipeline)
+        {
+            m_pPipeline->CreateShaderResourceBinding(ppShaderResourceBinding, InitStaticResources);
+        }
     }
 
     virtual void DILIGENT_CALL_TYPE InitializeStaticSRBResources(IShaderResourceBinding* pShaderResourceBinding) const override
@@ -168,6 +175,9 @@ class ProxyPipelineState : public Base
     }
 
 protected:
+    const std::string       m_Name;
+    const PipelineStateDesc m_Desc;
+
     RefCntAutoPtr<IPipelineState> m_pPipeline;
 };
 
diff --git a/Graphics/GraphicsTools/include/ReloadablePipelineState.hpp b/Graphics/GraphicsTools/include/ReloadablePipelineState.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2024 Diligent Graphics LLC
+ *  Copyright 2024-2025 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -84,7 +84,6 @@ class ReloadablePipelineState final : public ProxyPipelineState<ObjectBase<IPipe
 
     RefCntAutoPtr<RenderStateCacheImpl>    m_pStateCache;
     std::unique_ptr<CreateInfoWrapperBase> m_pCreateInfo;
-    const PIPELINE_TYPE                    m_Type;
 
     // Old pipeline state kept around to copy static resources from
     RefCntAutoPtr<IPipelineState> m_pOldPipeline;
diff --git a/Graphics/GraphicsTools/src/AsyncPipelineState.cpp b/Graphics/GraphicsTools/src/AsyncPipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2024 Diligent Graphics LLC
+ *  Copyright 2024-2025 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -73,9 +73,8 @@ struct AsyncPipelineState::CreateInfoWrapper : CreateInfoWrapperBase
 AsyncPipelineState::AsyncPipelineState(IReferenceCounters*            pRefCounters,
                                        RenderStateCacheImpl*          pStateCache,
                                        const PipelineStateCreateInfo& CreateInfo) :
-    TBase{pRefCounters},
+    TBase{CreateInfo.PSODesc, pRefCounters},
     m_pStateCache{pStateCache},
-    m_Type{CreateInfo.PSODesc.PipelineType},
     m_UniqueID{}
 {
     static_assert(PIPELINE_TYPE_COUNT == 5, "Did you add a new pipeline type? You may need to handle it here.");
@@ -132,7 +131,7 @@ void AsyncPipelineState::QueryInterface(const INTERFACE_ID& IID, IObject** ppInt
 void AsyncPipelineState::InitInternalPipeline()
 {
     static_assert(PIPELINE_TYPE_COUNT == 5, "Did you add a new pipeline type? You may need to handle it here.");
-    switch (m_Type)
+    switch (m_Desc.PipelineType)
     {
         case PIPELINE_TYPE_GRAPHICS:
         case PIPELINE_TYPE_MESH:
diff --git a/Graphics/GraphicsTools/src/ReloadablePipelineState.cpp b/Graphics/GraphicsTools/src/ReloadablePipelineState.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2024 Diligent Graphics LLC
+ *  Copyright 2024-2025 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -82,9 +82,8 @@ ReloadablePipelineState::ReloadablePipelineState(IReferenceCounters*
                                                  RenderStateCacheImpl*          pStateCache,
                                                  IPipelineState*                pPipeline,
                                                  const PipelineStateCreateInfo& CreateInfo) :
-    TBase{pRefCounters},
-    m_pStateCache{pStateCache},
-    m_Type{CreateInfo.PSODesc.PipelineType}
+    TBase{CreateInfo.PSODesc, pRefCounters},
+    m_pStateCache{pStateCache}
 {
     m_pPipeline = pPipeline;
 
@@ -249,7 +248,7 @@ bool ReloadablePipelineState::Reload(ReloadGraphicsPipelineCallbackType ReloadGr
     static_assert(PIPELINE_TYPE_COUNT == 5, "Did you add a new pipeline type? You may need to handle it here.");
     // Note that all shaders in Create Info are reloadable shaders, so they will automatically redirect all calls
     // to the updated internal shader
-    switch (m_Type)
+    switch (m_Desc.PipelineType)
     {
         case PIPELINE_TYPE_GRAPHICS:
         case PIPELINE_TYPE_MESH:

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2024 Diligent Graphics LLC`
	`2`	`+ * Copyright 2024-2025 Diligent Graphics LLC`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -31,6 +31,7 @@`
`31`	`31`
`32`	`32`	`#include "PipelineState.h"`
`33`	`33`	`#include "RefCntAutoPtr.hpp"`
	`34`	`+#include "PipelineStateBase.hpp"`
`34`	`35`
`35`	`36`	`namespace Diligent`
`36`	`37`	`{`
`@@ -42,15 +43,15 @@ class ProxyPipelineState : public Base`
`42`	`43`	`{`
`43`	`44`	`public:`
`44`	`45`	`template <typename... Args>`
`45`		`- ProxyPipelineState(Args&&... args) :`
`46`		`- Base{std::forward<Args>(args)...}`
	`46`	`+ ProxyPipelineState(const PipelineStateDesc& PSODesc, Args&&... args) :`
	`47`	`+ Base{std::forward<Args>(args)...},`
	`48`	`+ m_Name{PSODesc.Name != nullptr ? PSODesc.Name : ""},`
	`49`	`+ m_Desc{m_Name.c_str(), PSODesc.PipelineType}`
`47`	`50`	`{}`
`48`	`51`
`49`	`52`	`virtual const PipelineStateDesc& DILIGENT_CALL_TYPE GetDesc() const override`
`50`	`53`	`{`
`51`		`- DEV_CHECK_ERR(m_pPipeline, "Internal pipeline is null");`
`52`		`- static constexpr PipelineStateDesc NullDesc;`
`53`		`- return m_pPipeline ? m_pPipeline->GetDesc() : NullDesc;`
	`54`	`+ return m_pPipeline ? m_pPipeline->GetDesc() : m_Desc;`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`virtual Int32 DILIGENT_CALL_TYPE GetUniqueID() const override`
`@@ -62,7 +63,10 @@ class ProxyPipelineState : public Base`
`62`	`63`	`virtual void DILIGENT_CALL_TYPE SetUserData(IObject* pUserData) override`
`63`	`64`	`{`
`64`	`65`	`DEV_CHECK_ERR(m_pPipeline, "Internal pipeline is null");`
`65`		`- m_pPipeline->SetUserData(pUserData);`
	`66`	`+ if (m_pPipeline)`
	`67`	`+ {`
	`68`	`+ m_pPipeline->SetUserData(pUserData);`
	`69`	`+ }`
`66`	`70`	`}`
`67`	`71`
`68`	`72`	`virtual IObject* DILIGENT_CALL_TYPE GetUserData() const override`
`@@ -104,7 +108,7 @@ class ProxyPipelineState : public Base`
`104`	`108`	`virtual Uint32 DILIGENT_CALL_TYPE GetStaticVariableCount(SHADER_TYPE ShaderType) const override`
`105`	`109`	`{`
`106`	`110`	`DEV_CHECK_ERR(m_pPipeline, "Internal pipeline is null");`
`107`		`- return m_pPipeline->GetStaticVariableCount(ShaderType);`
	`111`	`+ return m_pPipeline ? m_pPipeline->GetStaticVariableCount(ShaderType) : 0;`
`108`	`112`	`}`
`109`	`113`
`110`	`114`	`virtual IShaderResourceVariable* DILIGENT_CALL_TYPE GetStaticVariableByName(SHADER_TYPE ShaderType, const Char* Name) override`
`@@ -122,7 +126,10 @@ class ProxyPipelineState : public Base`
`122`	`126`	`virtual void DILIGENT_CALL_TYPE CreateShaderResourceBinding(IShaderResourceBinding** ppShaderResourceBinding, bool InitStaticResources) override`
`123`	`127`	`{`
`124`	`128`	`DEV_CHECK_ERR(m_pPipeline, "Internal pipeline is null");`
`125`		`- m_pPipeline->CreateShaderResourceBinding(ppShaderResourceBinding, InitStaticResources);`
	`129`	`+ if (m_pPipeline)`
	`130`	`+ {`
	`131`	`+ m_pPipeline->CreateShaderResourceBinding(ppShaderResourceBinding, InitStaticResources);`
	`132`	`+ }`
`126`	`133`	`}`
`127`	`134`
`128`	`135`	`virtual void DILIGENT_CALL_TYPE InitializeStaticSRBResources(IShaderResourceBinding* pShaderResourceBinding) const override`
`@@ -168,6 +175,9 @@ class ProxyPipelineState : public Base`
`168`	`175`	`}`
`169`	`176`
`170`	`177`	`protected:`
	`178`	`+ const std::string m_Name;`
	`179`	`+ const PipelineStateDesc m_Desc;`
	`180`	`+`
`171`	`181`	`RefCntAutoPtr<IPipelineState> m_pPipeline;`
`172`	`182`	`};`
`173`	`183`