mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-10-20 21:09:37 +02:00
[TEST] Hunting down recursive mutex 3
(cherry picked from commit 933f79af95)
This commit is contained in:
parent
a8f4fdd20f
commit
65e45f0a9a
3 changed files with 3 additions and 3 deletions
|
|
@ -321,7 +321,7 @@ public:
|
||||||
} while (channel_state->has_deleted_buffers);
|
} while (channel_state->has_deleted_buffers);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::recursive_mutex mutex;
|
std::mutex mutex;
|
||||||
Runtime& runtime;
|
Runtime& runtime;
|
||||||
bool any_buffer_uploaded = false;
|
bool any_buffer_uploaded = false;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -716,7 +716,7 @@ void RasterizerOpenGL::AccelerateInlineToMemory(GPUVAddr address, size_t copy_si
|
||||||
}
|
}
|
||||||
gpu_memory->WriteBlockUnsafe(address, memory.data(), copy_size);
|
gpu_memory->WriteBlockUnsafe(address, memory.data(), copy_size);
|
||||||
{
|
{
|
||||||
std::unique_lock<std::recursive_mutex> lock{buffer_cache.mutex};
|
std::scoped_lock lock{buffer_cache.mutex};
|
||||||
if (!buffer_cache.InlineMemory(*cpu_addr, copy_size, memory)) {
|
if (!buffer_cache.InlineMemory(*cpu_addr, copy_size, memory)) {
|
||||||
buffer_cache.WriteMemory(*cpu_addr, copy_size);
|
buffer_cache.WriteMemory(*cpu_addr, copy_size);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -925,7 +925,7 @@ void RasterizerVulkan::AccelerateInlineToMemory(GPUVAddr address, size_t copy_si
|
||||||
}
|
}
|
||||||
gpu_memory->WriteBlockUnsafe(address, memory.data(), copy_size);
|
gpu_memory->WriteBlockUnsafe(address, memory.data(), copy_size);
|
||||||
{
|
{
|
||||||
std::unique_lock<std::recursive_mutex> lock{buffer_cache.mutex};
|
std::scoped_lock lock{buffer_cache.mutex};
|
||||||
if (!buffer_cache.InlineMemory(*cpu_addr, copy_size, memory)) {
|
if (!buffer_cache.InlineMemory(*cpu_addr, copy_size, memory)) {
|
||||||
buffer_cache.WriteMemory(*cpu_addr, copy_size);
|
buffer_cache.WriteMemory(*cpu_addr, copy_size);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue