rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-04 16:24:29 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Fix uninitialized BufferHandle when discarding mapped buffer

Browse Source 
Co-authored-by: Christopher Egert <cme3000@gmail.com>
This commit is contained in:
Robin Kertels 2020-06-14 23:30:42 +02:00 committed by Joshie
parent 9525f53d00
commit 291f7e05bc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/d3d9/d3d9_device.cpp
View File

@ -4006,7 +4006,7 @@ namespace dxvk {
std::memset(physSlice.mapPtr, 0, physSlice.length); std::memset(physSlice.mapPtr, 0, physSlice.length);
else if (managed && !skipWait) { else if (managed && !skipWait) {
if (!WaitForResource(mappedBuffer, D3DLOCK_DONOTWAIT)) { if (!WaitForResource(mappedBuffer, D3DLOCK_DONOTWAIT)) {
// if the mapped buffer is currently being copied to image and it's small enough // if the mapped buffer is currently being copied to image
// we can just avoid a stall by allocating a new slice and copying the existing contents // we can just avoid a stall by allocating a new slice and copying the existing contents
DxvkBufferSliceHandle oldSlice = physSlice; DxvkBufferSliceHandle oldSlice = physSlice;
physSlice = pResource->DiscardMapSlice(Subresource); physSlice = pResource->DiscardMapSlice(Subresource);
@ -4334,6 +4334,11 @@ namespace dxvk {
pResource->DirtyRange().Clear(); pResource->DirtyRange().Clear();
} }
else { else {
// Use map pointer from previous map operation. This
// way we don't have to synchronize with the CS thread
// if the map mode is D3DLOCK_NOOVERWRITE.
physSlice = pResource->GetMappedSlice();
// NOOVERWRITE promises that they will not write in a currently used area. // NOOVERWRITE promises that they will not write in a currently used area.
// Therefore we can skip waiting for these two cases. // Therefore we can skip waiting for these two cases.
// We can also skip waiting if there is not dirty range overlap, if we are one of those resources. // We can also skip waiting if there is not dirty range overlap, if we are one of those resources.
@ -4346,7 +4351,7 @@ namespace dxvk {
if (!skipWait) { if (!skipWait) {
if (IsPoolManaged(desc.Pool)) { if (IsPoolManaged(desc.Pool)) {
if (!WaitForResource(mappingBuffer, D3DLOCK_DONOTWAIT)) { if (!WaitForResource(mappingBuffer, D3DLOCK_DONOTWAIT)) {
// if the mapped buffer is currently being copied to the primary buffer and it's small enough // if the mapped buffer is currently being copied to the primary buffer
// we can just avoid a stall by allocating a new slice and copying the existing contents // we can just avoid a stall by allocating a new slice and copying the existing contents
DxvkBufferSliceHandle oldSlice = physSlice; DxvkBufferSliceHandle oldSlice = physSlice;
physSlice = pResource->DiscardMapSlice(); physSlice = pResource->DiscardMapSlice();
@ -4366,11 +4371,6 @@ namespace dxvk {
pResource->SetReadLocked(false); pResource->SetReadLocked(false);
pResource->DirtyRange().Clear(); pResource->DirtyRange().Clear();
} }
// Use map pointer from previous map operation. This
// way we don't have to synchronize with the CS thread
// if the map mode is D3DLOCK_NOOVERWRITE.
physSlice = pResource->GetMappedSlice();
} }
uint8_t* data = reinterpret_cast<uint8_t*>(physSlice.mapPtr); uint8_t* data = reinterpret_cast<uint8_t*>(physSlice.mapPtr);