diff options
| author | bunnei <bunneidev@gmail.com> | 2021-07-06 02:09:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 02:09:23 +0200 |
| commit | bf50345d4c13e34e69af0070632400b3472a1a11 (patch) | |
| tree | 1af5586d2d416c1a347ea0bfabed30a3a56d51e0 /src/video_core/texture_cache | |
| parent | Merge pull request #6556 from Morph1984/default-mii (diff) | |
| parent | CMakeLists: Disable all warnings for external headers (diff) | |
| download | yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar.gz yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar.bz2 yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar.lz yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar.xz yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar.zst yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.zip | |
Diffstat (limited to 'src/video_core/texture_cache')
| -rw-r--r-- | src/video_core/texture_cache/image_base.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/texture_cache/util.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/texture_cache/image_base.cpp b/src/video_core/texture_cache/image_base.cpp index ad69d32d1..f22358c90 100644 --- a/src/video_core/texture_cache/image_base.cpp +++ b/src/video_core/texture_cache/image_base.cpp @@ -82,7 +82,7 @@ std::optional<SubresourceBase> ImageBase::TryFindBase(GPUVAddr other_addr) const if (info.type != ImageType::e3D) { const auto [layer, mip_offset] = LayerMipOffset(diff, info.layer_stride); const auto end = mip_level_offsets.begin() + info.resources.levels; - const auto it = std::find(mip_level_offsets.begin(), end, mip_offset); + const auto it = std::find(mip_level_offsets.begin(), end, static_cast<u32>(mip_offset)); if (layer > info.resources.layers || it == end) { return std::nullopt; } diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index 4efe042b6..20794fa32 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp @@ -394,7 +394,7 @@ template <u32 GOB_EXTENT> const s32 mip_offset = diff % layer_stride; const std::array offsets = CalculateMipLevelOffsets(new_info); const auto end = offsets.begin() + new_info.resources.levels; - const auto it = std::find(offsets.begin(), end, mip_offset); + const auto it = std::find(offsets.begin(), end, static_cast<u32>(mip_offset)); if (it == end) { // Mipmap is not aligned to any valid size return std::nullopt; |