summaryrefslogtreecommitdiff
path: root/src/video_core/texture_cache
diff options
context:
space:
mode:
authorGravatar Fernando S2022-01-06 13:50:14 +0100
committerGravatar GitHub2022-01-06 13:50:14 +0100
commita95c49e7d0cb7d38e3db96023c40af551c681259 (patch)
tree2ee70e5b487cfc01b7a08350c269b0f569fa216e /src/video_core/texture_cache
parentMerge pull request #7679 from liushuyu/update-dynarmic (diff)
parentvideo_core/memory_manager: Fixes for sparse memory management (diff)
downloadyuzu-a95c49e7d0cb7d38e3db96023c40af551c681259.tar.gz
yuzu-a95c49e7d0cb7d38e3db96023c40af551c681259.tar.xz
yuzu-a95c49e7d0cb7d38e3db96023c40af551c681259.zip
Merge pull request #7658 from ameerj/sparse-fixes
video_core/memory_manager: Fixes for sparse memory management
Diffstat (limited to 'src/video_core/texture_cache')
-rw-r--r--src/video_core/texture_cache/texture_cache.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index b494152b8..198bb0cfb 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -1376,9 +1376,7 @@ void TextureCache<P>::ForEachSparseSegment(ImageBase& image, Func&& func) {
1376 using FuncReturn = typename std::invoke_result<Func, GPUVAddr, VAddr, size_t>::type; 1376 using FuncReturn = typename std::invoke_result<Func, GPUVAddr, VAddr, size_t>::type;
1377 static constexpr bool RETURNS_BOOL = std::is_same_v<FuncReturn, bool>; 1377 static constexpr bool RETURNS_BOOL = std::is_same_v<FuncReturn, bool>;
1378 const auto segments = gpu_memory.GetSubmappedRange(image.gpu_addr, image.guest_size_bytes); 1378 const auto segments = gpu_memory.GetSubmappedRange(image.gpu_addr, image.guest_size_bytes);
1379 for (auto& segment : segments) { 1379 for (const auto& [gpu_addr, size] : segments) {
1380 const auto gpu_addr = segment.first;
1381 const auto size = segment.second;
1382 std::optional<VAddr> cpu_addr = gpu_memory.GpuToCpuAddress(gpu_addr); 1380 std::optional<VAddr> cpu_addr = gpu_memory.GpuToCpuAddress(gpu_addr);
1383 ASSERT(cpu_addr); 1381 ASSERT(cpu_addr);
1384 if constexpr (RETURNS_BOOL) { 1382 if constexpr (RETURNS_BOOL) {