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/GraphicsEngineVulkan | |
| 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/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |