eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 59 Projects 1 Releases Packages Wiki Activity Actions

revert c267178e84192c1ba3a5ed6740220e467bd051c9

Browse source 
revert Revert "[vk] Remove improper check for image depth in texture cache. (#164)"

This reverts commit 6fd10fd85e.

Confirmed that this was not the cause of the slowdown issue so can be reverted for proper testing with other changes after a rebase.
This commit is contained in:
Shinmegumi 2025-08-01 19:29:41 +02:00 • committed by crueter
parent d81deeb775
commit a2f410f9da
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) { if (solution) {
gpu_addr = solution->gpu_addr; gpu_addr = solution->gpu_addr;
cpu_addr = solution->cpu_addr; cpu_addr = solution->cpu_addr;
// TODO: properly update new_info.size.depth.
new_info.resources = solution->resources; new_info.resources = solution->resources;
join_overlap_ids.push_back(overlap_id); join_overlap_ids.push_back(overlap_id);
join_copies_to_do.emplace_back(JoinCopy{false, 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: Copyright 2020 yuzu Emulator Project
// SPDX-FileCopyrightText: Ryujinx Team and Contributors // SPDX-FileCopyrightText: Ryujinx Team and Contributors
// SPDX-License-Identifier: GPL-2.0-or-later AND MIT // 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; return std::nullopt;
} }
if (existing.type == ImageType::e3D) { if (existing.type == ImageType::e3D) {
const u32 mip_depth = std::max(1U, existing.size.depth << base->level); // const u32 mip_depth = std::max(1U, existing.size.depth << base->level);
if (mip_depth < candidate.size.depth + base->layer) { // if (mip_depth < candidate.size.depth + base->layer) {
return std::nullopt; // return std::nullopt;
} // }
} else if (existing.resources.layers < candidate.resources.layers + base->layer) { } else if (existing.resources.layers < candidate.resources.layers + base->layer) {
return std::nullopt; return std::nullopt;
} }