yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Texture Cache: Further fix regressions.

This commit is contained in:
Fernando Sahmkow 2021-11-26 17:03:48 +01:00
parent 08674aee87
commit 1624f307d0
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1088,19 +1088,23 @@ typename TextureCache<P>::BlitImages TextureCache<P>::GetBlitImages(
ImageId src_id; ImageId src_id;
do { do {
has_deleted_images = false; has_deleted_images = false;
dst_id = FindImage(dst_info, dst_addr, FIND_OPTIONS);
src_id = FindImage(src_info, src_addr, FIND_OPTIONS); src_id = FindImage(src_info, src_addr, FIND_OPTIONS);
const ImageBase* const dst_image = dst_id ? &slot_images[dst_id] : nullptr;
const ImageBase* const src_image = src_id ? &slot_images[src_id] : nullptr; const ImageBase* const src_image = src_id ? &slot_images[src_id] : nullptr;
DeduceBlitImages(dst_info, src_info, dst_image, src_image); if (src_image && src_image->info.num_samples > 1) {
ASSERT(GetFormatType(dst_info.format) == GetFormatType(src_info.format)); RelaxedOptions find_options{FIND_OPTIONS | RelaxedOptions::ForceBrokenViews};
RelaxedOptions find_options{}; src_id = FindOrInsertImage(src_info, src_addr, find_options);
if (src_info.num_samples > 1) { dst_id = FindOrInsertImage(dst_info, dst_addr, find_options);
// it's a resolve, we must enforce the same format. if (has_deleted_images) {
find_options = RelaxedOptions::ForceBrokenViews; continue;
}
}
dst_id = FindImage(dst_info, dst_addr, FIND_OPTIONS);
if (!src_id) {
src_id = InsertImage(src_info, src_addr, RelaxedOptions{});
}
if (!dst_id) {
dst_id = InsertImage(dst_info, dst_addr, RelaxedOptions{});
} }
src_id = FindOrInsertImage(src_info, src_addr, find_options);
dst_id = FindOrInsertImage(dst_info, dst_addr, find_options);
} while (has_deleted_images); } while (has_deleted_images);
return BlitImages{ return BlitImages{
.dst_id = dst_id, .dst_id = dst_id,