summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryzct12345 <87620833+yzct12345@users.noreply.github.com>2021-07-18 23:56:06 +0200
committerGitHub <noreply@github.com>2021-07-18 23:56:06 +0200
commit9e7f41cec63c8f053a210e0df066ad21f08357af (patch)
tree9858a3ae3126a48781206bb137142604c098b06a
parentMerge pull request #6647 from lat9nq/specify-system-path (diff)
downloadyuzu-9e7f41cec63c8f053a210e0df066ad21f08357af.tar
yuzu-9e7f41cec63c8f053a210e0df066ad21f08357af.tar.gz
yuzu-9e7f41cec63c8f053a210e0df066ad21f08357af.tar.bz2
yuzu-9e7f41cec63c8f053a210e0df066ad21f08357af.tar.lz
yuzu-9e7f41cec63c8f053a210e0df066ad21f08357af.tar.xz
yuzu-9e7f41cec63c8f053a210e0df066ad21f08357af.tar.zst
yuzu-9e7f41cec63c8f053a210e0df066ad21f08357af.zip
-rw-r--r--src/video_core/renderer_vulkan/vk_texture_cache.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
index a2ab4d1ee..61b7a62a7 100644
--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
@@ -608,7 +608,10 @@ void TextureCacheRuntime::BlitImage(Framebuffer* dst_framebuffer, ImageView& dst
const VkImageAspectFlags aspect_mask = ImageAspectMask(src.format);
const bool is_dst_msaa = dst.Samples() != VK_SAMPLE_COUNT_1_BIT;
const bool is_src_msaa = src.Samples() != VK_SAMPLE_COUNT_1_BIT;
- ASSERT(aspect_mask == ImageAspectMask(dst.format));
+ if (aspect_mask != ImageAspectMask(dst.format) {
+ UNIMPLEMENTED_MSG("Incompatible blit from format {} to {}", src.format, dst.format));
+ return;
+ }
if (aspect_mask == VK_IMAGE_ASPECT_COLOR_BIT && !is_src_msaa && !is_dst_msaa) {
blit_image_helper.BlitColor(dst_framebuffer, src, dst_region, src_region, filter,
operation);