From 5ab6f691aeb95c0b04cde5612f892716300a1da1 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Wed, 17 Oct 2018 17:08:42 +0200 Subject: [PATCH] [d3d11] Remove some flush points These aren't as useful as they may look like since they occur at render pass boundaries anyway. --- src/d3d11/d3d11_context_imm.cpp | 101 -------------------------------- src/d3d11/d3d11_context_imm.h | 52 ---------------- 2 files changed, 153 deletions(-) diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp index 23759414..2782a494 100644 --- a/src/d3d11/d3d11_context_imm.cpp +++ b/src/d3d11/d3d11_context_imm.cpp @@ -197,107 +197,6 @@ namespace dxvk { } - void STDMETHODCALLTYPE D3D11ImmediateContext::CopySubresourceRegion( - ID3D11Resource* pDstResource, - UINT DstSubresource, - UINT DstX, - UINT DstY, - UINT DstZ, - ID3D11Resource* pSrcResource, - UINT SrcSubresource, - const D3D11_BOX* pSrcBox) { - FlushImplicit(); - - D3D11DeviceContext::CopySubresourceRegion( - pDstResource, DstSubresource, DstX, DstY, DstZ, - pSrcResource, SrcSubresource, pSrcBox); - } - - - void STDMETHODCALLTYPE D3D11ImmediateContext::CopySubresourceRegion1( - ID3D11Resource* pDstResource, - UINT DstSubresource, - UINT DstX, - UINT DstY, - UINT DstZ, - ID3D11Resource* pSrcResource, - UINT SrcSubresource, - const D3D11_BOX* pSrcBox, - UINT CopyFlags) { - FlushImplicit(); - - D3D11DeviceContext::CopySubresourceRegion1( - pDstResource, DstSubresource, DstX, DstY, DstZ, - pSrcResource, SrcSubresource, pSrcBox, CopyFlags); - } - - - void STDMETHODCALLTYPE D3D11ImmediateContext::CopyResource( - ID3D11Resource* pDstResource, - ID3D11Resource* pSrcResource) { - FlushImplicit(); - - D3D11DeviceContext::CopyResource( - pDstResource, pSrcResource); - } - - - void STDMETHODCALLTYPE D3D11ImmediateContext::GenerateMips( - ID3D11ShaderResourceView* pShaderResourceView) { - FlushImplicit(); - - D3D11DeviceContext::GenerateMips( - pShaderResourceView); - } - - - void STDMETHODCALLTYPE D3D11ImmediateContext::UpdateSubresource( - ID3D11Resource* pDstResource, - UINT DstSubresource, - const D3D11_BOX* pDstBox, - const void* pSrcData, - UINT SrcRowPitch, - UINT SrcDepthPitch) { - FlushImplicit(); - - D3D11DeviceContext::UpdateSubresource( - pDstResource, DstSubresource, pDstBox, - pSrcData, SrcRowPitch, SrcDepthPitch); - } - - - void STDMETHODCALLTYPE D3D11ImmediateContext::UpdateSubresource1( - ID3D11Resource* pDstResource, - UINT DstSubresource, - const D3D11_BOX* pDstBox, - const void* pSrcData, - UINT SrcRowPitch, - UINT SrcDepthPitch, - UINT CopyFlags) { - FlushImplicit(); - - D3D11DeviceContext::UpdateSubresource1( - pDstResource, DstSubresource, pDstBox, - pSrcData, SrcRowPitch, SrcDepthPitch, - CopyFlags); - } - - - void STDMETHODCALLTYPE D3D11ImmediateContext::ResolveSubresource( - ID3D11Resource* pDstResource, - UINT DstSubresource, - ID3D11Resource* pSrcResource, - UINT SrcSubresource, - DXGI_FORMAT Format) { - FlushImplicit(); - - D3D11DeviceContext::ResolveSubresource( - pDstResource, DstSubresource, - pSrcResource, SrcSubresource, - Format); - } - - void STDMETHODCALLTYPE D3D11ImmediateContext::OMSetRenderTargets( UINT NumViews, ID3D11RenderTargetView* const* ppRenderTargetViews, diff --git a/src/d3d11/d3d11_context_imm.h b/src/d3d11/d3d11_context_imm.h index 35598554..90582f97 100644 --- a/src/d3d11/d3d11_context_imm.h +++ b/src/d3d11/d3d11_context_imm.h @@ -52,58 +52,6 @@ namespace dxvk { ID3D11Resource* pResource, UINT Subresource); - void STDMETHODCALLTYPE CopySubresourceRegion( - ID3D11Resource* pDstResource, - UINT DstSubresource, - UINT DstX, - UINT DstY, - UINT DstZ, - ID3D11Resource* pSrcResource, - UINT SrcSubresource, - const D3D11_BOX* pSrcBox); - - void STDMETHODCALLTYPE CopySubresourceRegion1( - ID3D11Resource* pDstResource, - UINT DstSubresource, - UINT DstX, - UINT DstY, - UINT DstZ, - ID3D11Resource* pSrcResource, - UINT SrcSubresource, - const D3D11_BOX* pSrcBox, - UINT CopyFlags); - - void STDMETHODCALLTYPE CopyResource( - ID3D11Resource* pDstResource, - ID3D11Resource* pSrcResource); - - void STDMETHODCALLTYPE GenerateMips( - ID3D11ShaderResourceView* pShaderResourceView); - - void STDMETHODCALLTYPE UpdateSubresource( - ID3D11Resource* pDstResource, - UINT DstSubresource, - const D3D11_BOX* pDstBox, - const void* pSrcData, - UINT SrcRowPitch, - UINT SrcDepthPitch); - - void STDMETHODCALLTYPE UpdateSubresource1( - ID3D11Resource* pDstResource, - UINT DstSubresource, - const D3D11_BOX* pDstBox, - const void* pSrcData, - UINT SrcRowPitch, - UINT SrcDepthPitch, - UINT CopyFlags); - - void STDMETHODCALLTYPE ResolveSubresource( - ID3D11Resource* pDstResource, - UINT DstSubresource, - ID3D11Resource* pSrcResource, - UINT SrcSubresource, - DXGI_FORMAT Format); - void STDMETHODCALLTYPE OMSetRenderTargets( UINT NumViews, ID3D11RenderTargetView* const* ppRenderTargetViews,