Merge pull request #7551 from vonchenplus/fix_blit_image_view_mismatching

Fix blit image/view not compatible
This commit is contained in:
bunnei 2021-12-15 21:39:53 -08:00 committed by GitHub
commit 7cf74abbf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1137,8 +1137,13 @@ typename TextureCache<P>::BlitImages TextureCache<P>::GetBlitImages(
} while (has_deleted_images); } while (has_deleted_images);
const ImageBase& src_image = slot_images[src_id]; const ImageBase& src_image = slot_images[src_id];
const ImageBase& dst_image = slot_images[dst_id]; const ImageBase& dst_image = slot_images[dst_id];
const bool native_bgr = runtime.HasNativeBgr();
if (GetFormatType(dst_info.format) != GetFormatType(dst_image.info.format) || if (GetFormatType(dst_info.format) != GetFormatType(dst_image.info.format) ||
GetFormatType(src_info.format) != GetFormatType(src_image.info.format)) { GetFormatType(src_info.format) != GetFormatType(src_image.info.format) ||
!VideoCore::Surface::IsViewCompatible(dst_info.format, dst_image.info.format, false,
native_bgr) ||
!VideoCore::Surface::IsViewCompatible(src_info.format, src_image.info.format, false,
native_bgr)) {
// Make sure the images match the expected format. // Make sure the images match the expected format.
do { do {
has_deleted_images = false; has_deleted_images = false;