mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-10 05:38:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

video_core: fix for targets clears and copies (#1670)

Browse Source
This commit is contained in:
psucien
2024-12-05 22:09:22 +01:00
committed by GitHub
parent 15ae7a094d
commit 37f4bad2b7
3 changed files with 61 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/video_core/texture_cache/texture_cache.cpp
View File

@@ -398,17 +398,15 @@ ImageView& TextureCache::FindRenderTarget(BaseDesc& desc) {
// Register meta data for this color buffer
if (!(image.flags & ImageFlagBits::MetaRegistered)) {
if (desc.info.meta_info.cmask_addr) {
surface_metas.emplace(
desc.info.meta_info.cmask_addr,
MetaDataInfo{.type = MetaDataInfo::Type::CMask, .is_cleared = true});
surface_metas.emplace(desc.info.meta_info.cmask_addr,
MetaDataInfo{.type = MetaDataInfo::Type::CMask});
image.info.meta_info.cmask_addr = desc.info.meta_info.cmask_addr;
image.flags |= ImageFlagBits::MetaRegistered;
}
if (desc.info.meta_info.fmask_addr) {
surface_metas.emplace(
desc.info.meta_info.fmask_addr,
MetaDataInfo{.type = MetaDataInfo::Type::FMask, .is_cleared = true});
surface_metas.emplace(desc.info.meta_info.fmask_addr,
MetaDataInfo{.type = MetaDataInfo::Type::FMask});
image.info.meta_info.fmask_addr = desc.info.meta_info.fmask_addr;
image.flags |= ImageFlagBits::MetaRegistered;
}
@@ -428,9 +426,8 @@ ImageView& TextureCache::FindDepthTarget(BaseDesc& desc) {
// Register meta data for this depth buffer
if (!(image.flags & ImageFlagBits::MetaRegistered)) {
if (desc.info.meta_info.htile_addr) {
surface_metas.emplace(
desc.info.meta_info.htile_addr,
MetaDataInfo{.type = MetaDataInfo::Type::HTile, .is_cleared = true});
surface_metas.emplace(desc.info.meta_info.htile_addr,
MetaDataInfo{.type = MetaDataInfo::Type::HTile});
image.info.meta_info.htile_addr = desc.info.meta_info.htile_addr;
image.flags |= ImageFlagBits::MetaRegistered;
}

23
src/video_core/texture_cache/texture_cache.h
View File

@@ -156,18 +156,31 @@ public:
return surface_metas.contains(address);
}
bool IsMetaCleared(VAddr address) const {
bool IsMetaCleared(VAddr address, u32 slice) const {
const auto& it = surface_metas.find(address);
if (it != surface_metas.end()) {
return it.value().is_cleared;
return it.value().clear_mask & (1u << slice);
}
return false;
}
bool TouchMeta(VAddr address, bool is_clear) {
bool ClearMeta(VAddr address) {
auto it = surface_metas.find(address);
if (it != surface_metas.end()) {
it.value().is_cleared = is_clear;
it.value().clear_mask = u32(-1);
return true;
}
return false;
}
bool TouchMeta(VAddr address, u32 slice, bool is_clear) {
auto it = surface_metas.find(address);
if (it != surface_metas.end()) {
if (is_clear) {
it.value().clear_mask |= 1u << slice;
} else {
it.value().clear_mask &= ~(1u << slice);
}
return true;
}
return false;
@@ -280,7 +293,7 @@ private:
HTile,
};
Type type;
bool is_cleared;
u32 clear_mask{u32(-1)};
};
tsl::robin_map<VAddr, MetaDataInfo> surface_metas;
};