mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-22 18:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

texture_cache: Handle overlap with equal address and different tiling mode (#2981)

Browse Source
This commit is contained in:
squidbus 2025-05-23 10:56:46 -07:00 committed by GitHub
parent d124f40503
commit e5c6c88835
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,14 +222,23 @@ std::tuple<ImageId, int, int> TextureCache::ResolveOverlap(const ImageInfo& imag
-1, -1}; -1, -1};
} }
ImageId new_image_id{}; if (image_info.type == tex_cache_image.info.type &&
if (image_info.type == tex_cache_image.info.type) { image_info.resources > tex_cache_image.info.resources) {
ASSERT(image_info.resources > tex_cache_image.info.resources); // Size and resources are greater, expand the image.
new_image_id = ExpandImage(image_info, cache_image_id); return {ExpandImage(image_info, cache_image_id), -1, -1};
} else {
UNREACHABLE();
} }
return {new_image_id, -1, -1};
if (image_info.tiling_mode != tex_cache_image.info.tiling_mode) {
// Size is greater but resources are not, because the tiling mode is different.
// Likely this memory address is being reused for a different image with a different
// tiling mode.
if (safe_to_delete) {
FreeImage(cache_image_id);
}
return {merged_image_id, -1, -1};
}
UNREACHABLE_MSG("Encountered unresolvable image overlap with equal memory address.");
} }
// Right overlap, the image requested is a possible subresource of the image from cache. // Right overlap, the image requested is a possible subresource of the image from cache.