rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-20 19:54:19 +01:00
Code Issues Projects Releases Wiki Activity

[d3d11] Move Track*SequenceNumber methods to D3D11CommonContext

Browse Source
This commit is contained in:
Philip Rebohle 2022-08-03 21:21:11 +02:00
parent 532b3a6add
commit 9a2d8878ef
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
4 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/d3d11/d3d11_context.cpp
View File

@ -144,25 +144,4 @@ namespace dxvk {
pMsState->enableAlphaToCoverage = VK_FALSE;
}
void D3D11DeviceContext::TrackResourceSequenceNumber(
ID3D11Resource* pResource) {
if (!pResource)
return;
D3D11CommonTexture* texture = GetCommonTexture(pResource);
if (texture) {
if (texture->HasSequenceNumber()) {
for (uint32_t i = 0; i < texture->CountSubresources(); i++)
TrackTextureSequenceNumber(texture, i);
}
} else {
D3D11Buffer* buffer = static_cast<D3D11Buffer*>(pResource);
if (buffer->HasSequenceNumber())
TrackBufferSequenceNumber(buffer);
}
}
}

10
src/d3d11/d3d11_context.h
View File

@ -95,16 +95,6 @@ namespace dxvk {
return bufferSize >= Offset + Size;
}
void TrackResourceSequenceNumber(
ID3D11Resource* pResource);
virtual void TrackTextureSequenceNumber(
D3D11CommonTexture* pResource,
UINT Subresource) = 0;
virtual void TrackBufferSequenceNumber(
D3D11Buffer* pResource) = 0;
};

38
src/d3d11/d3d11_context_common.cpp
View File

@ -451,7 +451,7 @@ namespace dxvk {
});
if (buf->HasSequenceNumber())
TrackBufferSequenceNumber(buf);
GetTypedContext()->TrackBufferSequenceNumber(buf);
}
@ -1015,7 +1015,7 @@ namespace dxvk {
}
if (dstTextureInfo->HasSequenceNumber())
TrackTextureSequenceNumber(dstTextureInfo, DstSubresource);
GetTypedContext()->TrackTextureSequenceNumber(dstTextureInfo, DstSubresource);
}
@ -3545,9 +3545,9 @@ namespace dxvk {
});
if (pDstBuffer->HasSequenceNumber())
TrackBufferSequenceNumber(pDstBuffer);
GetTypedContext()->TrackBufferSequenceNumber(pDstBuffer);
if (pSrcBuffer->HasSequenceNumber())
TrackBufferSequenceNumber(pSrcBuffer);
GetTypedContext()->TrackBufferSequenceNumber(pSrcBuffer);
}
@ -3786,14 +3786,14 @@ namespace dxvk {
if (pDstTexture->HasSequenceNumber()) {
for (uint32_t i = 0; i < pDstLayers->layerCount; i++) {
TrackTextureSequenceNumber(pDstTexture, D3D11CalcSubresource(
GetTypedContext()->TrackTextureSequenceNumber(pDstTexture, D3D11CalcSubresource(
pDstLayers->mipLevel, pDstLayers->baseArrayLayer + i, pDstTexture->Desc()->MipLevels));
}
}
if (pSrcTexture->HasSequenceNumber()) {
for (uint32_t i = 0; i < pSrcLayers->layerCount; i++) {
TrackTextureSequenceNumber(pSrcTexture, D3D11CalcSubresource(
GetTypedContext()->TrackTextureSequenceNumber(pSrcTexture, D3D11CalcSubresource(
pSrcLayers->mipLevel, pSrcLayers->baseArrayLayer + i, pSrcTexture->Desc()->MipLevels));
}
}
@ -4532,6 +4532,28 @@ namespace dxvk {
}
template<typename ContextType>
void D3D11CommonContext<ContextType>::TrackResourceSequenceNumber(
ID3D11Resource* pResource) {
if (!pResource)
return;
D3D11CommonTexture* texture = GetCommonTexture(pResource);
if (texture) {
if (texture->HasSequenceNumber()) {
for (uint32_t i = 0; i < texture->CountSubresources(); i++)
GetTypedContext()->TrackTextureSequenceNumber(texture, i);
}
} else {
D3D11Buffer* buffer = static_cast<D3D11Buffer*>(pResource);
if (buffer->HasSequenceNumber())
GetTypedContext()->TrackBufferSequenceNumber(buffer);
}
}
template<typename ContextType>
void D3D11CommonContext<ContextType>::UpdateBuffer(
D3D11Buffer* pDstBuffer,
@ -4576,7 +4598,7 @@ namespace dxvk {
}
if (pDstBuffer->HasSequenceNumber())
TrackBufferSequenceNumber(pDstBuffer);
GetTypedContext()->TrackBufferSequenceNumber(pDstBuffer);
}
@ -4726,7 +4748,7 @@ namespace dxvk {
}
if (pDstTexture->HasSequenceNumber())
TrackTextureSequenceNumber(pDstTexture, dstSubresource);
GetTypedContext()->TrackTextureSequenceNumber(pDstTexture, dstSubresource);
}

3
src/d3d11/d3d11_context_common.h
View File

@ -958,6 +958,9 @@ namespace dxvk {
bool TestSrvHazards(
D3D11ShaderResourceView* pView);
void TrackResourceSequenceNumber(
ID3D11Resource* pResource);
void UpdateBuffer(
D3D11Buffer* pDstBuffer,
UINT Offset,