Added aliasing barrier for NVApi resources

Author: azhirnov

Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp

@@ -2009,16 +2009,20 @@ static void AliasingBarrier(ID3D11DeviceContext* pd3d11Ctx, IDeviceObject* pReso
 {
     DEV_CHECK_ERR(CComQIPtr<ID3D11DeviceContext2>{pd3d11Ctx}, "Failed to query ID3D11DeviceContext2");
     auto* pd3d11DeviceContext2 = static_cast<ID3D11DeviceContext2*>(pd3d11Ctx);
+    bool  UseNVApi             = false;
 
-    auto GetD3D11Resource = [](IDeviceObject* pResource) -> ID3D11Resource* //
+    auto GetD3D11Resource = [&UseNVApi](IDeviceObject* pResource) -> ID3D11Resource* //
     {
         if (RefCntAutoPtr<ITextureD3D11> pTexture{pResource, IID_TextureD3D11})
         {
+            const auto* pTexD3D11 = pTexture.RawPtr<const TextureBaseD3D11>();
+            if (pTexD3D11->IsUsingNVApi())
+                UseNVApi = true;
             return pTexture->GetD3D11Texture();
         }
         else if (RefCntAutoPtr<IBufferD3D11> pBuffer{pResource, IID_BufferD3D11})
         {
-            return pBuffer->GetD3D11Buffer();
+            return pBuffer.RawPtr<BufferD3D11Impl>()->GetD3D11Buffer();
         }
         else
         {
@@ -2029,7 +2033,17 @@ static void AliasingBarrier(ID3D11DeviceContext* pd3d11Ctx, IDeviceObject* pReso
     auto* pd3d11ResourceBefore = GetD3D11Resource(pResourceBefore);
     auto* pd3d11ResourceAfter  = GetD3D11Resource(pResourceAfter);
 
-    pd3d11DeviceContext2->TiledResourceBarrier(pd3d11ResourceBefore, pd3d11ResourceAfter);
+#ifdef DILIGENT_ENABLE_D3D_NVAPI
+    if (UseNVApi)
+    {
+        NvAPI_D3D11_TiledResourceBarrier(pd3d11DeviceContext2, pd3d11ResourceBefore, pd3d11ResourceAfter);
+    }
+    else
+#endif
+    {
+        VERIFY_EXPR(!UseNVApi);
+        pd3d11DeviceContext2->TiledResourceBarrier(pd3d11ResourceBefore, pd3d11ResourceAfter);
+    }
 }
 
 void DeviceContextD3D11Impl::TransitionResourceStates(Uint32 BarrierCount, const StateTransitionDesc* pResourceBarriers)

Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp

@@ -65,7 +65,7 @@ class TextureD3D12Impl final : public TextureBase<EngineD3D12ImplTraits>, public
     IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_TextureD3D12, TTextureBase)
 
     /// Implementation of ITextureD3D12::GetD3D12Texture().
-    virtual ID3D12Resource* DILIGENT_CALL_TYPE GetD3D12Texture() override final { return GetD3D12Resource(); }
+    virtual ID3D12Resource* DILIGENT_CALL_TYPE GetD3D12Texture() const override final { return GetD3D12Resource(); }
 
     /// Implementation of ITexture::GetNativeHandle() in Direct3D12 backend.
     virtual Uint64 DILIGENT_CALL_TYPE GetNativeHandle() override final { return BitCast<Uint64>(GetD3D12Texture()); }

Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h

@@ -54,7 +54,7 @@ DILIGENT_BEGIN_INTERFACE(ITextureD3D12, ITexture)
 
     /// The method does *NOT* increment the reference counter of the returned object,
     /// so Release() must not be called.
-    VIRTUAL ID3D12Resource* METHOD(GetD3D12Texture)(THIS) PURE;
+    VIRTUAL ID3D12Resource* METHOD(GetD3D12Texture)(THIS) CONST PURE;
 
     /// Sets the texture usage state
 

Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp

@@ -2354,11 +2354,15 @@ void DeviceContextD3D12Impl::EndQuery(IQuery* pQuery)
 
 static void AliasingBarrier(CommandContext& CmdCtx, IDeviceObject* pResourceBefore, IDeviceObject* pResourceAfter)
 {
-    auto GetD3D12Resource = [](IDeviceObject* pResource) -> ID3D12Resource* //
+    bool UseNVApi         = false;
+    auto GetD3D12Resource = [&UseNVApi](IDeviceObject* pResource) -> ID3D12Resource* //
     {
         if (RefCntAutoPtr<ITextureD3D12> pTexture{pResource, IID_TextureD3D12})
         {
-            return pTexture.RawPtr<TextureD3D12Impl>()->GetD3D12Texture();
+            const auto* pTexD3D12 = pTexture.RawPtr<const TextureD3D12Impl>();
+            if (pTexD3D12->IsUsingNVApi())
+                UseNVApi = true;
+            return pTexD3D12->GetD3D12Texture();
         }
         else if (RefCntAutoPtr<IBufferD3D12> pBuffer{pResource, IID_BufferD3D12})
         {
@@ -2376,7 +2380,17 @@ static void AliasingBarrier(CommandContext& CmdCtx, IDeviceObject* pResourceBefo
     Barrier.Aliasing.pResourceBefore = GetD3D12Resource(pResourceBefore);
     Barrier.Aliasing.pResourceAfter  = GetD3D12Resource(pResourceAfter);
 
-    CmdCtx.ResourceBarrier(Barrier);
+#ifdef DILIGENT_ENABLE_D3D_NVAPI
+    if (UseNVApi)
+    {
+        NvAPI_D3D12_ResourceAliasingBarrier(CmdCtx.GetCommandList(), 1, &Barrier);
+    }
+    else
+#endif
+    {
+        VERIFY_EXPR(!UseNVApi);
+        CmdCtx.ResourceBarrier(Barrier);
+    }
 }
 
 void DeviceContextD3D12Impl::TransitionResourceStates(Uint32 BarrierCount, const StateTransitionDesc* pResourceBarriers)