mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-21 03:55:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vk: Forcefully unmap DMA blocks before destroying them (#10359)

Browse source 
- While the vulkan spec explicitly allows destroying mapped blocks, GPUOpen vma_alloc does not.
- Strangely, this issue does not afflict linux users, only windows.
This commit is contained in:
kd-11 2021-05-28 01:03:46 +03:00 • committed by GitHub
parent f9d9d12f11
commit 763828837b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
rpcs3/Emu/RSX/VK/VKDMA.cpp
View file

@ -76,11 +76,22 @@ namespace vk
{
if (allocated_memory)
{
// Do some accounting before the allocation info is no more
s_allocated_dma_pool_size -= allocated_memory->size();
// If you have both a memory allocation AND a parent block at the same time, you're in trouble
ensure(head() == this);
if (memory_mapping)
{
// vma allocator does not allow us to destroy mapped memory on windows
unmap();
ensure(!memory_mapping);
}
// Move allocation to gc
auto gc = vk::get_resource_manager();
gc->dispose(allocated_memory);
memory_mapping = nullptr;
}
}
@ -174,15 +185,15 @@ namespace vk
return;
}
inheritance_info.parent = parent;
inheritance_info.block_offset = (base_address - parent->base_address);
if (allocated_memory)
{
// Acquired blocks are always to be assumed dirty. It is not possible to synchronize host access and inline
// buffer copies without causing weird issues. Overlapped incomplete data ends up overwriting host-uploaded data.
free();
}
inheritance_info.parent = parent;
inheritance_info.block_offset = (base_address - parent->base_address);
}
void dma_block::extend(const render_device& dev, usz new_size)