Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-10-20 18:59:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[TEST] Hunting down recursive mutex 3

Browse source 
(cherry picked from commit 933f79af95)
This commit is contained in:
CamilleLaVey 2026-07-17 02:15:10 -04:00
parent a8f4fdd20f
commit 65e45f0a9a
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/video_core/buffer_cache/buffer_cache_base.h
View file

@ -321,7 +321,7 @@ public:
} while (channel_state->has_deleted_buffers);
}
std::recursive_mutex mutex;
std::mutex mutex;
Runtime& runtime;
bool any_buffer_uploaded = false;

2
src/video_core/renderer_opengl/gl_rasterizer.cpp
View file

@ -716,7 +716,7 @@ void RasterizerOpenGL::AccelerateInlineToMemory(GPUVAddr address, size_t copy_si
}
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)) {
buffer_cache.WriteMemory(*cpu_addr, copy_size);
}

2
src/video_core/renderer_vulkan/vk_rasterizer.cpp
View file

@ -925,7 +925,7 @@ void RasterizerVulkan::AccelerateInlineToMemory(GPUVAddr address, size_t copy_si
}
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)) {
buffer_cache.WriteMemory(*cpu_addr, copy_size);
}