diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-07-02 23:38:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-02 23:38:21 +0200 |
commit | 5e3695ecaa4a3b62249b67df13b7ceccc20ce92e (patch) | |
tree | 3e4b85ba87828fbde889d35b598019bf3e866cc0 /src/video_core/texture_cache | |
parent | Merge pull request #10969 from Morph1984/k-synchronize (diff) | |
parent | renderer_vulkan: Fix some missing view formats (diff) | |
download | yuzu-5e3695ecaa4a3b62249b67df13b7ceccc20ce92e.tar yuzu-5e3695ecaa4a3b62249b67df13b7ceccc20ce92e.tar.gz yuzu-5e3695ecaa4a3b62249b67df13b7ceccc20ce92e.tar.bz2 yuzu-5e3695ecaa4a3b62249b67df13b7ceccc20ce92e.tar.lz yuzu-5e3695ecaa4a3b62249b67df13b7ceccc20ce92e.tar.xz yuzu-5e3695ecaa4a3b62249b67df13b7ceccc20ce92e.tar.zst yuzu-5e3695ecaa4a3b62249b67df13b7ceccc20ce92e.zip |
Diffstat (limited to 'src/video_core/texture_cache')
-rw-r--r-- | src/video_core/texture_cache/types.h | 1 | ||||
-rw-r--r-- | src/video_core/texture_cache/util.cpp | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/video_core/texture_cache/types.h b/src/video_core/texture_cache/types.h index a0e10643f..0453456b4 100644 --- a/src/video_core/texture_cache/types.h +++ b/src/video_core/texture_cache/types.h @@ -54,7 +54,6 @@ enum class RelaxedOptions : u32 { Format = 1 << 1, Samples = 1 << 2, ForceBrokenViews = 1 << 3, - FormatBpp = 1 << 4, }; DECLARE_ENUM_FLAG_OPERATORS(RelaxedOptions) diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index 9a618a57a..0de6ed09d 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp @@ -1201,8 +1201,7 @@ std::optional<SubresourceBase> FindSubresource(const ImageInfo& candidate, const // 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) && - False(options & RelaxedOptions::FormatBpp)) { + if (BytesPerBlock(existing.format) != BytesPerBlock(candidate.format)) { return std::nullopt; } } else { @@ -1233,11 +1232,7 @@ std::optional<SubresourceBase> FindSubresource(const ImageInfo& candidate, const } const bool strict_size = False(options & RelaxedOptions::Size); if (!IsBlockLinearSizeCompatible(existing, candidate, base->level, 0, strict_size)) { - if (False(options & RelaxedOptions::FormatBpp)) { - return std::nullopt; - } else if (!IsBlockLinearSizeCompatibleBPPRelaxed(existing, candidate, base->level, 0)) { - return std::nullopt; - } + return std::nullopt; } // TODO: compare block sizes return base; |