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

[dxvk] Fix potential iterator invalidation in deferClear/Discard

Browse Source 
flushClears clears the deferred clear list, so we need to
break out of the loop on that code path.
This commit is contained in:
Philip Rebohle 2021-03-01 16:47:47 +01:00
parent 31063252eb
commit 9bdc491cb7
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dxvk/dxvk_context.cpp
View File

@ -1868,8 +1868,10 @@ namespace dxvk {
entry.clearValue.depthStencil.stencil = clearValue.depthStencil.stencil; entry.clearValue.depthStencil.stencil = clearValue.depthStencil.stencil;
return; return;
} else if (entry.imageView->checkSubresourceOverlap(imageView)) } else if (entry.imageView->checkSubresourceOverlap(imageView)) {
this->flushClears(false); this->flushClears(false);
break;
}
} }
m_deferredClears.push_back({ imageView, 0, clearAspects, clearValue }); m_deferredClears.push_back({ imageView, 0, clearAspects, clearValue });
@ -1884,8 +1886,10 @@ namespace dxvk {
entry.discardAspects |= discardAspects; entry.discardAspects |= discardAspects;
entry.clearAspects &= ~discardAspects; entry.clearAspects &= ~discardAspects;
return; return;
} else if (entry.imageView->checkSubresourceOverlap(imageView)) } else if (entry.imageView->checkSubresourceOverlap(imageView)) {
this->flushClears(false); this->flushClears(false);
break;
}
} }
m_deferredClears.push_back({ imageView, discardAspects }); m_deferredClears.push_back({ imageView, discardAspects });