aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorweakboson <weakboson@quantum-field.net>2025-07-31 17:47:29 +0200
committercrueter <crueter@eden-emu.dev>2025-07-31 17:47:29 +0200
commit6fd10fd85eda83ce660f79bf6e5491806df2cf6d (patch)
treec00af887ad5fb3b380b20f452421709327ff1833 /src
parentc1d9cbca647d20c5f6ede7ba8107097dc518f7bc (diff)
[vk] Remove improper check for image depth in texture cache. (#164)
When looking for existing images, ImageBase::TryFindBase checks the depth of the existing image to be greater than the layer of the base + depth of the candidate. However the depth of images are not updated when cache were merged causing the lookup to fail. This commit disables this faulty check to fix a critical memory leak that crashes the emulator in some games. Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/164 Co-authored-by: weakboson <weakboson@quantum-field.net> Co-committed-by: weakboson <weakboson@quantum-field.net>
Diffstat (limited to 'src')
-rw-r--r--src/video_core/texture_cache/texture_cache.h1
-rw-r--r--src/video_core/texture_cache/util.cpp11
2 files changed, 8 insertions, 4 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 6c733fe902..78b6684c49 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -1426,6 +1426,7 @@ ImageId TextureCache<P>::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, DA
if (solution) {
gpu_addr = solution->gpu_addr;
cpu_addr = solution->cpu_addr;
+ // TODO: properly update new_info.size.depth.
new_info.resources = solution->resources;
join_overlap_ids.push_back(overlap_id);
join_copies_to_do.emplace_back(JoinCopy{false, overlap_id});
diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp
index 1a6f0d1ad1..f61a8558d9 100644
--- a/src/video_core/texture_cache/util.cpp
+++ b/src/video_core/texture_cache/util.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-FileCopyrightText: Ryujinx Team and Contributors
// SPDX-License-Identifier: GPL-2.0-or-later AND MIT
@@ -1216,10 +1219,10 @@ std::optional<SubresourceBase> FindSubresource(const ImageInfo& candidate, const
return std::nullopt;
}
if (existing.type == ImageType::e3D) {
- const u32 mip_depth = std::max(1U, existing.size.depth << base->level);
- if (mip_depth < candidate.size.depth + base->layer) {
- return std::nullopt;
- }
+ // const u32 mip_depth = std::max(1U, existing.size.depth << base->level);
+ // if (mip_depth < candidate.size.depth + base->layer) {
+ // return std::nullopt;
+ // }
} else if (existing.resources.layers < candidate.resources.layers + base->layer) {
return std::nullopt;
}