diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2021-11-21 05:32:34 +0100 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2021-11-21 05:37:01 +0100 |
commit | 779f4ac72d2ea2788c2106c8d2d1ec0e01b77b81 (patch) | |
tree | 035e612bd819dd191ce79046c2e5900fccbfbeba /src/video_core/texture_cache/texture_cache.h | |
parent | Merge pull request #7368 from FernandoS27/vulkan-conv (diff) | |
download | yuzu-779f4ac72d2ea2788c2106c8d2d1ec0e01b77b81.tar yuzu-779f4ac72d2ea2788c2106c8d2d1ec0e01b77b81.tar.gz yuzu-779f4ac72d2ea2788c2106c8d2d1ec0e01b77b81.tar.bz2 yuzu-779f4ac72d2ea2788c2106c8d2d1ec0e01b77b81.tar.lz yuzu-779f4ac72d2ea2788c2106c8d2d1ec0e01b77b81.tar.xz yuzu-779f4ac72d2ea2788c2106c8d2d1ec0e01b77b81.tar.zst yuzu-779f4ac72d2ea2788c2106c8d2d1ec0e01b77b81.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 44a0d42ba..0e4907c53 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1079,7 +1079,7 @@ ImageId TextureCache<P>::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA template <class P> typename TextureCache<P>::BlitImages TextureCache<P>::GetBlitImages( const Tegra::Engines::Fermi2D::Surface& dst, const Tegra::Engines::Fermi2D::Surface& src) { - static constexpr auto FIND_OPTIONS = RelaxedOptions::Format | RelaxedOptions::Samples; + static constexpr auto FIND_OPTIONS = RelaxedOptions::Samples; const GPUVAddr dst_addr = dst.Address(); const GPUVAddr src_addr = src.Address(); ImageInfo dst_info(dst); @@ -1093,9 +1093,7 @@ typename TextureCache<P>::BlitImages TextureCache<P>::GetBlitImages( const ImageBase* const dst_image = dst_id ? &slot_images[dst_id] : nullptr; const ImageBase* const src_image = src_id ? &slot_images[src_id] : nullptr; DeduceBlitImages(dst_info, src_info, dst_image, src_image); - if (GetFormatType(dst_info.format) != GetFormatType(src_info.format)) { - continue; - } + ASSERT(GetFormatType(dst_info.format) == GetFormatType(src_info.format)); RelaxedOptions find_options{}; if (src_info.num_samples > 1) { // it's a resolve, we must enforce the same format. |