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

Fix incompatible format images being passed on overlap resolve (#794)

Browse source
This commit is contained in:
Daniel R. 2024-09-06 19:09:28 +02:00 committed by GitHub
parent 6bf9cac98b
commit 96f22813ce
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/video_core/texture_cache/texture_cache.cpp
View file

@ -109,9 +109,12 @@ ImageId TextureCache::ResolveOverlap(const ImageInfo& image_info, ImageId cache_
}
if (image_info.pixel_format != tex_cache_image.info.pixel_format ||
image_info.size != tex_cache_image.info.size ||
image_info.guest_size_bytes <= tex_cache_image.info.guest_size_bytes) {
return merged_image_id ? merged_image_id : cache_image_id;
auto result_id = merged_image_id ? merged_image_id : cache_image_id;
const auto& result_image = slot_images[result_id];
return IsVulkanFormatCompatible(image_info.pixel_format, result_image.info.pixel_format)
? result_id
: ImageId{};
}
ImageId new_image_id{};