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/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp index 98119b2c..8aaee7f7 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp @@ -745,7 +745,7 @@ PipelineStateVkImpl::PipelineStateVkImpl(IReferenceCounters* p PipelineStateVkImpl::PipelineStateVkImpl(IReferenceCounters* pRefCounters, RenderDeviceVkImpl* pDeviceVk, const RayTracingPipelineStateCreateInfo& CreateInfo) : - TPipelineStateBase{pRefCounters, pDeviceVk, CreateInfo.PSODesc}, + TPipelineStateBase{pRefCounters, pDeviceVk, CreateInfo}, m_SRBMemAllocator{GetRawAllocator()} { try -- cgit v1.2.3