drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2025-12-19 18:53:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: Prevent race condition on unmapped memory reads"

Browse Source 
This reverts commit 13c60ebcde.

This needs a rework as it caused Shader Corruption On Many Titles
This commit is contained in:
Zephyron
2025-10-16 17:40:53 +10:00
parent ab18e750d8
commit 7dea15e642
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/video_core/buffer_cache/buffer_cache.h
View File

@@ -8,7 +8,6 @@
#include <memory> #include <memory>
#include <numeric> #include <numeric>
#include "common/logging/log.h"
#include "common/range_sets.inc" #include "common/range_sets.inc"
#include "video_core/buffer_cache/buffer_cache_base.h" #include "video_core/buffer_cache/buffer_cache_base.h"
#include "video_core/guest_memory.h" #include "video_core/guest_memory.h"
@@ -1510,25 +1509,13 @@ template <class P>
void BufferCache<P>::MappedUploadMemory([[maybe_unused]] Buffer& buffer, void BufferCache<P>::MappedUploadMemory([[maybe_unused]] Buffer& buffer,
[[maybe_unused]] u64 total_size_bytes, [[maybe_unused]] u64 total_size_bytes,
[[maybe_unused]] std::span<BufferCopy> copies) { [[maybe_unused]] std::span<BufferCopy> copies) {
if constexpr (USE_MEMORY_MAPS) { if constexpr (USE_MEMORY_MAPS) {
auto upload_staging = runtime.UploadStagingBuffer(total_size_bytes); auto upload_staging = runtime.UploadStagingBuffer(total_size_bytes);
const std::span<u8> staging_pointer = upload_staging.mapped_span; const std::span<u8> staging_pointer = upload_staging.mapped_span;
for (BufferCopy& copy : copies) { for (BufferCopy& copy : copies) {
u8* const src_pointer = staging_pointer.data() + copy.src_offset; u8* const src_pointer = staging_pointer.data() + copy.src_offset;
const DAddr device_addr = buffer.CpuAddr() + copy.dst_offset; const DAddr device_addr = buffer.CpuAddr() + copy.dst_offset;
// GetSpan is a fast way to check for contiguous, mapped memory.
// If it returns nullptr, the memory is unmapped or fragmented.
if (device_memory.GetSpan(device_addr, copy.size) == nullptr) {
// The memory is no longer valid. Log a warning and fill this chunk with zeros
// to prevent the GPU from rendering garbage.
LOG_WARNING(Render_Vulkan, "MappedUploadMemory: Aborting copy from now-unmapped guest address 0x{:08X}", device_addr);
std::memset(src_pointer, 0, copy.size);
} else {
// Memory is valid, proceed with the copy.
device_memory.ReadBlockUnsafe(device_addr, src_pointer, copy.size); device_memory.ReadBlockUnsafe(device_addr, src_pointer, copy.size);
}
// Apply the staging offset // Apply the staging offset
copy.src_offset += upload_staging.offset; copy.src_offset += upload_staging.offset;