guoyunhe/eden
1
0
Fork 0
forked from eden-emu/eden
Code Pull requests Activity

[vk] Remove improper check for image depth in texture cache. (#164)

Browse source 
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: eden-emu/eden#164
Co-authored-by: weakboson <weakboson@quantum-field.net>
Co-committed-by: weakboson <weakboson@quantum-field.net>
This commit is contained in:
weakboson 2025-07-31 17:47:29 +02:00 • committed by crueter
parent c1d9cbca64
commit 6fd10fd85e
Signed by untrusted user: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/video_core/texture_cache/texture_cache.h
View file

@ -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});

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

@ -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;
}