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

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

Browse source 
This reverts commit 6fd10fd85e.
This commit is contained in:
Maufeat 2025-08-01 12:25:09 +02:00 • committed by crueter
parent a4c4f37d72
commit 8c6018e378
2 changed files with 4 additions and 8 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,7 +1426,6 @@ 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,6 +1,3 @@
// 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
@ -1219,10 +1216,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;
}