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

[d3d9] Fix D3DLOCK_READONLY handling with evictManagedOnUnlock

Browse Source
This commit is contained in:
Robin Kertels 2021-07-30 23:53:48 +02:00 committed by Joshie
parent 2c8099adf1
commit 60a7047550
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/d3d9/d3d9_device.cpp
View File

@ -4280,7 +4280,9 @@ namespace dxvk {
pResource->SetLocked(Subresource, true);
if ((desc.Pool == D3DPOOL_DEFAULT || !(Flags & D3DLOCK_NO_DIRTY_UPDATE)) && !(Flags & D3DLOCK_READONLY)) {
const bool noDirtyUpdate = Flags & D3DLOCK_NO_DIRTY_UPDATE;
if (likely((pResource->IsManaged() && m_d3d9Options.evictManagedOnUnlock)
|| ((desc.Pool == D3DPOOL_DEFAULT || !noDirtyUpdate) && !readOnly))) {
if (pBox && MipLevel != 0) {
D3DBOX scaledBox = *pBox;
scaledBox.Left <<= MipLevel;
@ -4341,8 +4343,9 @@ namespace dxvk {
// Flush image contents from staging if we aren't read only
// and we aren't deferring for managed.
const D3DBOX& box = pResource->GetDirtyBox(Face);
bool shouldFlush = pResource->GetMapMode() == D3D9_COMMON_TEXTURE_MAP_MODE_BACKED;
shouldFlush &= !pResource->GetReadOnlyLocked(Subresource);
shouldFlush &= box.Left < box.Right && box.Top < box.Bottom && box.Front < box.Back;
shouldFlush &= !pResource->IsManaged() || m_d3d9Options.evictManagedOnUnlock;
if (shouldFlush) {
@ -4658,7 +4661,7 @@ namespace dxvk {
if (pResource->GetMapMode() != D3D9_COMMON_BUFFER_MAP_MODE_BUFFER)
return D3D_OK;
if (pResource->GetMapFlags() & D3DLOCK_READONLY)
if (pResource->DirtyRange().IsDegenerate())
return D3D_OK;
pResource->SetMapFlags(0);