diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-10-28 02:52:33 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-10-28 02:52:33 +0000 |
| commit | d829cacd06b2a78708e1e4772a833dad2ade5856 (patch) | |
| tree | 8c942a879c8bcbef52f2adea1e16d111c2714212 /Graphics/GraphicsEngineD3D12 | |
| parent | Merge branch 'master' into ray_tracing (diff) | |
| download | DiligentCore-d829cacd06b2a78708e1e4772a833dad2ade5856.tar.gz DiligentCore-d829cacd06b2a78708e1e4772a833dad2ade5856.zip | |
Fixed two minor merge issues
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp index d6b4290b..efae7b37 100644 --- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp @@ -620,7 +620,7 @@ PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D12Impl* pDeviceD3D12, const RayTracingPipelineStateCreateInfo& CreateInfo) : - TPipelineStateBase{pRefCounters, pDeviceD3D12, CreateInfo.PSODesc}, + TPipelineStateBase{pRefCounters, pDeviceD3D12, CreateInfo}, m_SRBMemAllocator{GetRawAllocator()} { try |