From a94f67adaa70292396ae161243f5794346074801 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Tue, 6 Dec 2022 23:43:56 +0100 Subject: [PATCH] Point to latest RB/nvrhi/main --- neo/extern/nvrhi | 2 +- neo/renderer/Passes/CommonPasses.cpp | 2 +- neo/sys/DeviceManager_VK.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/neo/extern/nvrhi b/neo/extern/nvrhi index 51cd95cb..8ad2903d 160000 --- a/neo/extern/nvrhi +++ b/neo/extern/nvrhi @@ -1 +1 @@ -Subproject commit 51cd95cb71ffe38ac70177b5d41e772e29b1d708 +Subproject commit 8ad2903dc00bebed1d5fa58f58af38f663c90bf9 diff --git a/neo/renderer/Passes/CommonPasses.cpp b/neo/renderer/Passes/CommonPasses.cpp index 01eb5dbb..61dfcae1 100644 --- a/neo/renderer/Passes/CommonPasses.cpp +++ b/neo/renderer/Passes/CommonPasses.cpp @@ -225,7 +225,7 @@ void CommonRenderPasses::BlitTexture( nvrhi::ICommandList* commandList, const Bl assert( targetFramebufferDesc.colorAttachments[0].valid() ); assert( !targetFramebufferDesc.depthAttachment.valid() ); - const nvrhi::FramebufferInfo& fbinfo = params.targetFramebuffer->getFramebufferInfo(); + const nvrhi::FramebufferInfoEx& fbinfo = params.targetFramebuffer->getFramebufferInfo(); const nvrhi::TextureDesc& sourceDesc = params.sourceTexture->getDesc(); assert( IsSupportedBlitDimension( sourceDesc.dimension ) ); diff --git a/neo/sys/DeviceManager_VK.cpp b/neo/sys/DeviceManager_VK.cpp index a08ab5a1..e0166340 100644 --- a/neo/sys/DeviceManager_VK.cpp +++ b/neo/sys/DeviceManager_VK.cpp @@ -839,6 +839,7 @@ bool DeviceManager_VK::createDevice() .setDescriptorBindingVariableDescriptorCount( true ) .setTimelineSemaphore( true ) .setShaderSampledImageArrayNonUniformIndexing( true ) + .setBufferDeviceAddress( bufferAddressSupported ) .setPNext( pNext ); auto layerVec = stringSetToVector( enabledExtensions.layers );