From d829cacd06b2a78708e1e4772a833dad2ade5856 Mon Sep 17 00:00:00 2001 From: assiduous Date: Tue, 27 Oct 2020 19:52:33 -0700 Subject: Fixed two minor merge issues --- Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Graphics/GraphicsEngineD3D12') 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 -- cgit v1.2.3