lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-11-30 16:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6469 from ReinUsesLisp/blit-view-compat

Browse source 
texture_cache/util: Avoid relaxed image views on different bytes per block
This commit is contained in:
Ameer J 2021-06-16 21:08:07 -04:00 committed by GitHub
parent 973bf306ed 3d89398b84
commit c5b517aa5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/video_core/texture_cache/util.cpp
View file

@ -1096,7 +1096,15 @@ std::optional<SubresourceBase> FindSubresource(const ImageInfo& candidate, const
return std::nullopt; return std::nullopt;
} }
const ImageInfo& existing = image.info; const ImageInfo& existing = image.info;
if (False(options & RelaxedOptions::Format)) { if (True(options & RelaxedOptions::Format)) {
// Format checking is relaxed, but we still have to check for matching bytes per block.
// This avoids creating a view for blits on UE4 titles where formats with different bytes
// per block are aliased.
if (BytesPerBlock(existing.format) != BytesPerBlock(candidate.format)) {
return std::nullopt;
}
} else {
// Format comaptibility is not relaxed, ensure we are creating a view on a compatible format
if (!IsViewCompatible(existing.format, candidate.format, broken_views, native_bgr)) { if (!IsViewCompatible(existing.format, candidate.format, broken_views, native_bgr)) {
return std::nullopt; return std::nullopt;
} }