diff options
| author | bunnei <bunneidev@gmail.com> | 2021-12-16 06:39:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-16 06:39:53 +0100 |
| commit | 7cf74abbf5fa5aca712dfaad0ed5e07a797dcbbb (patch) | |
| tree | 47f32844e483e087409a4d5a1082acaea0f5c226 | |
| parent | Merge pull request #7588 from Wunkolo/gibibibi-bytes (diff) | |
| parent | Fix blit image/view not compatible (diff) | |
| download | yuzu-7cf74abbf5fa5aca712dfaad0ed5e07a797dcbbb.tar yuzu-7cf74abbf5fa5aca712dfaad0ed5e07a797dcbbb.tar.gz yuzu-7cf74abbf5fa5aca712dfaad0ed5e07a797dcbbb.tar.bz2 yuzu-7cf74abbf5fa5aca712dfaad0ed5e07a797dcbbb.tar.lz yuzu-7cf74abbf5fa5aca712dfaad0ed5e07a797dcbbb.tar.xz yuzu-7cf74abbf5fa5aca712dfaad0ed5e07a797dcbbb.tar.zst yuzu-7cf74abbf5fa5aca712dfaad0ed5e07a797dcbbb.zip | |
| -rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index e195b1e98..5aaeb16ca 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1137,8 +1137,13 @@ typename TextureCache<P>::BlitImages TextureCache<P>::GetBlitImages( } while (has_deleted_images); const ImageBase& src_image = slot_images[src_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) || - 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. do { has_deleted_images = false; |