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

[d3d9] Fix some issues with dirty box handling

Browse Source 
- The dst texture in UpdateSurface must be in D3DPOOL_DEFAULT
  which doesn't do dirty tracking. So we don't need to
  call AddDirtyBox there.
- Clear DirtyBox when we flush managed textures with EvictManagedOnUnlock.
- Do nothing in AddDirtyBox for D3DPOOL_DEFAULT textures
This commit is contained in:
Robin Kertels 2021-03-17 23:05:24 +01:00 committed by Joshie
parent cb5f8aa392
commit 8159e87331
2 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d9/d3d9_common_texture.h
View File

@ -376,6 +376,10 @@ namespace dxvk {
|| box.Back <= box.Front) || box.Back <= box.Front)
return; return;
box.Right = std::min(box.Right, m_desc.Width);
box.Bottom = std::min(box.Bottom, m_desc.Height);
box.Back = std::min(box.Back, m_desc.Depth);
D3DBOX& dirtyBox = m_dirtyBoxes[layer]; D3DBOX& dirtyBox = m_dirtyBoxes[layer];
if (dirtyBox.Left == dirtyBox.Right) { if (dirtyBox.Left == dirtyBox.Right) {
dirtyBox = box; dirtyBox = box;

49
src/d3d9/d3d9_device.cpp
View File

@ -652,19 +652,6 @@ namespace dxvk {
if (unlikely(srcTextureInfo->Desc()->Format != dstTextureInfo->Desc()->Format)) if (unlikely(srcTextureInfo->Desc()->Format != dstTextureInfo->Desc()->Format))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
if (dst->GetMipLevel() == 0) {
if (pSourceRect) {
D3DBOX updateDirtyRect = { UINT(pSourceRect->left), UINT(pSourceRect->top), UINT(pSourceRect->right), UINT(pSourceRect->bottom), 0, 1 };
if (pDestinationSurface) {
updateDirtyRect.Left = pDestPoint->x;
updateDirtyRect.Top = pDestPoint->y;
}
dstTextureInfo->AddDirtyBox(&updateDirtyRect, dst->GetFace());
} else {
dstTextureInfo->AddDirtyBox(nullptr, dst->GetFace());
}
}
const DxvkFormatInfo* formatInfo = imageFormatInfo(dstTextureInfo->GetFormatMapping().FormatColor); const DxvkFormatInfo* formatInfo = imageFormatInfo(dstTextureInfo->GetFormatMapping().FormatColor);
VkOffset3D srcBlockOffset = { 0u, 0u, 0u }; VkOffset3D srcBlockOffset = { 0u, 0u, 0u };
@ -3979,21 +3966,6 @@ namespace dxvk {
if (unlikely((Flags & (D3DLOCK_DISCARD | D3DLOCK_NOOVERWRITE)) == (D3DLOCK_DISCARD | D3DLOCK_NOOVERWRITE))) if (unlikely((Flags & (D3DLOCK_DISCARD | D3DLOCK_NOOVERWRITE)) == (D3DLOCK_DISCARD | D3DLOCK_NOOVERWRITE)))
Flags &= ~D3DLOCK_DISCARD; Flags &= ~D3DLOCK_DISCARD;
if (!(Flags & D3DLOCK_NO_DIRTY_UPDATE) && !(Flags & D3DLOCK_READONLY)) {
if (pBox && MipLevel != 0) {
D3DBOX scaledBox = *pBox;
scaledBox.Left <<= MipLevel;
scaledBox.Right = std::min(scaledBox.Right << MipLevel, pResource->Desc()->Width);
scaledBox.Top <<= MipLevel;
scaledBox.Bottom = std::min(scaledBox.Bottom << MipLevel, pResource->Desc()->Height);
scaledBox.Back <<= MipLevel;
scaledBox.Front = std::min(scaledBox.Front << MipLevel, pResource->Desc()->Depth);
pResource->AddDirtyBox(&scaledBox, Face);
} else {
pResource->AddDirtyBox(pBox, Face);
}
}
auto& desc = *(pResource->Desc()); auto& desc = *(pResource->Desc());
bool alloced = pResource->CreateBufferSubresource(Subresource); bool alloced = pResource->CreateBufferSubresource(Subresource);
@ -4202,6 +4174,21 @@ namespace dxvk {
pResource->SetLocked(Subresource, true); pResource->SetLocked(Subresource, true);
if (!(Flags & D3DLOCK_NO_DIRTY_UPDATE) && !(Flags & D3DLOCK_READONLY)) {
if (pBox && MipLevel != 0) {
D3DBOX scaledBox = *pBox;
scaledBox.Left <<= MipLevel;
scaledBox.Right = std::min(scaledBox.Right << MipLevel, pResource->Desc()->Width);
scaledBox.Top <<= MipLevel;
scaledBox.Bottom = std::min(scaledBox.Bottom << MipLevel, pResource->Desc()->Height);
scaledBox.Back <<= MipLevel;
scaledBox.Front = std::min(scaledBox.Front << MipLevel, pResource->Desc()->Depth);
pResource->AddDirtyBox(&scaledBox, Face);
} else {
pResource->AddDirtyBox(pBox, Face);
}
}
if (pResource->IsManaged() && !m_d3d9Options.evictManagedOnUnlock && !readOnly) { if (pResource->IsManaged() && !m_d3d9Options.evictManagedOnUnlock && !readOnly) {
pResource->SetNeedsUpload(Subresource, true); pResource->SetNeedsUpload(Subresource, true);
@ -4252,8 +4239,11 @@ namespace dxvk {
shouldFlush &= !pResource->GetReadOnlyLocked(Subresource); shouldFlush &= !pResource->GetReadOnlyLocked(Subresource);
shouldFlush &= !pResource->IsManaged() || m_d3d9Options.evictManagedOnUnlock; shouldFlush &= !pResource->IsManaged() || m_d3d9Options.evictManagedOnUnlock;
if (shouldFlush) if (shouldFlush) {
this->FlushImage(pResource, Subresource); this->FlushImage(pResource, Subresource);
if (pResource->IsManaged())
pResource->ClearDirtyBoxes();
}
// Toss our staging buffer if we're not dynamic // Toss our staging buffer if we're not dynamic
// and we aren't managed (for sysmem copy.) // and we aren't managed (for sysmem copy.)
@ -5024,6 +5014,7 @@ namespace dxvk {
this->FlushImage(pResource, subresource); this->FlushImage(pResource, subresource);
} }
pResource->ClearDirtyBoxes();
pResource->ClearNeedsUpload(); pResource->ClearNeedsUpload();
} }