early-access version 2266

This commit is contained in:
pineappleEA 2021-12-04 12:34:20 +01:00
parent c1e3a52de5
commit 36b7eaf688
2 changed files with 7 additions and 4 deletions

View file

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 2265. This is the source code for early-access 2266.
## Legal Notice ## Legal Notice

View file

@ -1122,7 +1122,7 @@ typename TextureCache<P>::BlitImages TextureCache<P>::GetBlitImages(
break; break;
} }
if (can_be_depth_blit) { if (can_be_depth_blit) {
const ImageBase* const dst_image = src_id ? &slot_images[src_id] : nullptr; const ImageBase* const dst_image = dst_id ? &slot_images[dst_id] : nullptr;
DeduceBlitImages(dst_info, src_info, dst_image, src_image); DeduceBlitImages(dst_info, src_info, dst_image, src_image);
if (GetFormatType(dst_info.format) != GetFormatType(src_info.format)) { if (GetFormatType(dst_info.format) != GetFormatType(src_info.format)) {
continue; continue;
@ -1135,8 +1135,11 @@ typename TextureCache<P>::BlitImages TextureCache<P>::GetBlitImages(
dst_id = InsertImage(dst_info, dst_addr, RelaxedOptions{}); dst_id = InsertImage(dst_info, dst_addr, RelaxedOptions{});
} }
} while (has_deleted_images); } while (has_deleted_images);
if (GetFormatType(dst_info.format) != SurfaceType::ColorTexture) { const ImageBase& src_image = slot_images[src_id];
// Make sure the images are depth and/or stencil textures. const ImageBase& dst_image = slot_images[dst_id];
if (GetFormatType(dst_info.format) != GetFormatType(dst_image.info.format) ||
GetFormatType(src_info.format) != GetFormatType(src_image.info.format)) {
// Make sure the images match the expected format.
do { do {
has_deleted_images = false; has_deleted_images = false;
src_id = FindOrInsertImage(src_info, src_addr, RelaxedOptions{}); src_id = FindOrInsertImage(src_info, src_addr, RelaxedOptions{});