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/GraphicsEngineD3D12 | |
| 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/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp index a446e960..d6b4290b 100644 --- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp @@ -350,7 +350,7 @@ void PipelineStateD3D12Impl::InitInternalObjects(const PSOCreateInfoType& Create PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D12Impl* pDeviceD3D12, const GraphicsPipelineStateCreateInfo& CreateInfo) : - TPipelineStateBase{pRefCounters, pDeviceD3D12, CreateInfo.PSODesc}, + TPipelineStateBase{pRefCounters, pDeviceD3D12, CreateInfo}, m_SRBMemAllocator{GetRawAllocator()} { try @@ -561,7 +561,7 @@ PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D12Impl* pDeviceD3D12, const ComputePipelineStateCreateInfo& CreateInfo) : - TPipelineStateBase{pRefCounters, pDeviceD3D12, CreateInfo.PSODesc}, + TPipelineStateBase{pRefCounters, pDeviceD3D12, CreateInfo}, m_SRBMemAllocator{GetRawAllocator()} { try |