diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-10-28 02:49:19 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-10-28 02:49:19 +0000 |
| commit | a59012af4b50cc053ac3b0856d594a1170a3263b (patch) | |
| tree | 5f1939de540a5e7b953445444f978f1d0710451b /Graphics/GraphicsEngine | |
| parent | Fixed Linux/Max build errors (diff) | |
| parent | Fixed issue with wrong base constructor being called for PipelineStateVkImpl,... (diff) | |
| download | DiligentCore-a59012af4b50cc053ac3b0856d594a1170a3263b.tar.gz DiligentCore-a59012af4b50cc053ac3b0856d594a1170a3263b.zip | |
Merge branch 'master' into ray_tracing
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/PipelineStateBase.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Graphics/GraphicsEngine/include/PipelineStateBase.hpp b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp index e8987cdd..6ce6280b 100644 --- a/Graphics/GraphicsEngine/include/PipelineStateBase.hpp +++ b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp @@ -61,7 +61,7 @@ void CorrectGraphicsPipelineDesc(GraphicsPipelineDesc& GraphicsPipeline) noexcep template <class BaseInterface, class RenderDeviceImplType> class PipelineStateBase : public DeviceObjectBase<BaseInterface, RenderDeviceImplType, PipelineStateDesc> { -public: +private: using TDeviceObjectBase = DeviceObjectBase<BaseInterface, RenderDeviceImplType, PipelineStateDesc>; /// \param pRefCounters - Reference counters object that controls the lifetime of this PSO @@ -82,6 +82,7 @@ public: this->m_Desc.CommandQueueMask &= DeviceQueuesMask; } +public: /// \param pRefCounters - Reference counters object that controls the lifetime of this PSO /// \param pDevice - Pointer to the device. /// \param GraphicsPipelineCI - Graphics pipeline create information. |