mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 16:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed false-positive image reuploads

Browse Source
This commit is contained in:
Vladislav Mikhalin 2024-11-20 21:56:08 +03:00
parent 3f1be5a4ce
commit 0f99682eb6
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/page_manager.cpp
View File

@ -158,7 +158,7 @@ struct PageManager::Impl {
const bool is_write = Common::IsWriteError(context); const bool is_write = Common::IsWriteError(context);
if (is_write && owned_ranges.find(addr) != owned_ranges.end()) { if (is_write && owned_ranges.find(addr) != owned_ranges.end()) {
const VAddr addr_aligned = Common::AlignDown(addr, PAGESIZE); const VAddr addr_aligned = Common::AlignDown(addr, PAGESIZE);
rasterizer->InvalidateMemory(addr_aligned, PAGESIZE); rasterizer->InvalidateMemory(addr, addr_aligned, PAGESIZE);
return true; return true;
} }
return false; return false;

6
src/video_core/renderer_vulkan/vk_rasterizer.cpp
View File

@ -792,9 +792,9 @@ u32 Rasterizer::ReadDataFromGds(u32 gds_offset) {
return value; return value;
} }
void Rasterizer::InvalidateMemory(VAddr addr, u64 size) { void Rasterizer::InvalidateMemory(VAddr addr, VAddr addr_aligned, u64 size) {
buffer_cache.InvalidateMemory(addr, size); buffer_cache.InvalidateMemory(addr_aligned, size);
texture_cache.InvalidateMemory(addr, size); texture_cache.InvalidateMemory(addr, addr_aligned, size);
} }
void Rasterizer::MapMemory(VAddr addr, u64 size) { void Rasterizer::MapMemory(VAddr addr, u64 size) {

2
src/video_core/renderer_vulkan/vk_rasterizer.h
View File

@ -46,7 +46,7 @@ public:
void InlineData(VAddr address, const void* value, u32 num_bytes, bool is_gds); void InlineData(VAddr address, const void* value, u32 num_bytes, bool is_gds);
u32 ReadDataFromGds(u32 gsd_offset); u32 ReadDataFromGds(u32 gsd_offset);
void InvalidateMemory(VAddr addr, u64 size); void InvalidateMemory(VAddr addr, VAddr addr_aligned, u64 size);
void MapMemory(VAddr addr, u64 size); void MapMemory(VAddr addr, u64 size);
void UnmapMemory(VAddr addr, u64 size); void UnmapMemory(VAddr addr, u64 size);

14
src/video_core/texture_cache/texture_cache.cpp
View File

@ -43,11 +43,17 @@ TextureCache::TextureCache(const Vulkan::Instance& instance_, Vulkan::Scheduler&
TextureCache::~TextureCache() = default; TextureCache::~TextureCache() = default;
void TextureCache::InvalidateMemory(VAddr address, size_t size) { void TextureCache::InvalidateMemory(VAddr addr, VAddr addr_aligned, size_t size) {
std::scoped_lock lock{mutex}; std::scoped_lock lock{mutex};
ForEachImageInRegion(address, size, [&](ImageId image_id, Image& image) { ForEachImageInRegion(addr_aligned, size, [&](ImageId image_id, Image& image) {
// Ensure image is reuploaded when accessed again. const auto addr_begin = addr;
image.flags |= ImageFlagBits::CpuDirty; const auto addr_end = addr + size;
const auto image_begin = image.info.guest_address;
const auto image_end = image.info.guest_address + image.info.guest_size_bytes;
if (addr_begin < image_end && image_begin < addr_end) {
// Ensure image is reuploaded when accessed again.
image.flags |= ImageFlagBits::CpuDirty;
}
// Untrack image, so the range is unprotected and the guest can write freely. // Untrack image, so the range is unprotected and the guest can write freely.
UntrackImage(image_id); UntrackImage(image_id);
}); });

2
src/video_core/texture_cache/texture_cache.h
View File

@ -95,7 +95,7 @@ public:
~TextureCache(); ~TextureCache();
/// Invalidates any image in the logical page range. /// Invalidates any image in the logical page range.
void InvalidateMemory(VAddr address, size_t size); void InvalidateMemory(VAddr addr, VAddr addr_aligned, size_t size);
/// Marks an image as dirty if it exists at the provided address. /// Marks an image as dirty if it exists at the provided address.
void InvalidateMemoryFromGPU(VAddr address, size_t max_size); void InvalidateMemoryFromGPU(VAddr address, size_t max_size);