raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-26 12:56:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

texture_cache: view BC images for raw reads of their layers instead of evicting them

Browse Source
This commit is contained in:
nmzik
2026-10-26 02:20:54 +01:00
parent ce5e57aa36
commit 72d7da7266
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/host_gpu/renderer/cache/textureCache.cpp
Vendored
+9 -1
View File
@@ -783,7 +783,15 @@ TextureCache::OverlapResult TextureCache::ResolveOverlap(const ImageInfo& reques
if (!cached.registered) {
return {merged_id};
}
if (BcAlias::Matches(requested, cached.info) && !cached.IsCpuDirty()) {
// PS5: image heaps keep BC images and raw block views of their layers resident together, so a
// raw read of a layer subset with the same levels views the BC image instead of evicting it.
const bool raw_view = binding == BindingType::Texture && !requested.IsBlock() &&
requested.type == cached.info.type &&
requested.data.address == cached.info.data.address &&
requested.BlockExtent() == cached.info.BlockExtent() &&
requested.resources.levels == cached.info.resources.levels &&
requested.resources.layers < cached.info.resources.layers;
if (!raw_view && BcAlias::Matches(requested, cached.info) && !cached.IsCpuDirty()) {
BcAlias::Resolve(*this, cached_id, merged_id);
return {merged_id};
}
tests/ShaderRecompilerComputeTests.cpp
+34
View File
@@ -7692,6 +7692,40 @@ public:
verify_array();
}
// Image heaps keep a BC6H array and a raw block view of its first cube resident together.
// That raw read views the BC image and creates its view; a raw writer or a raw image of
// other levels, whose layers lie elsewhere, still replaces it.
for (uint32_t scenario = 0; scenario < 3; ++scenario) {
const uint64_t address = base + 0x1b00000 + scenario * 0x180000;
auto bc = MakeLinearDesc(address, 0, vk::Format::eBc6HUfloatBlock,
Prospero::BufferFormat::kBc6UFloat, Prospero::ImageType::kColor2D,
{256, 256, 1}, 12, 16, 1);
auto raw = MakeLinearDesc(address, 0, vk::Format::eR32G32B32A32Uint,
Prospero::BufferFormat::k32_32_32_32UInt, Prospero::ImageType::kColor2D,
{64, 64, 1}, 6, 16, 1);
bc.info.resources.levels = 6;
raw.info.resources.levels = scenario == 2 ? 1 : 6;
for (auto *desc : {&bc, &raw}) {
desc->info.tile_mode = Prospero::TileMode::kStandard4KB;
desc->info.UpdateSize();
desc->view_info.level_count = desc->info.resources.levels;
}
if (scenario == 1) {
raw.type = BindingType::Storage;
raw.view_info.usage = vk::ImageUsageFlagBits::eStorage;
}
const auto bc_image = texture_cache.FindImage(bc);
(void)texture_cache.FindTexture(bc_image, bc);
const auto raw_image = texture_cache.FindImage(raw);
const bool viewed = scenario == 0;
Require(name, "raw block view of a BC image",
(raw_image == bc_image) == viewed &&
texture_cache.GetImage(bc_image).registered == viewed,
"a raw block read did not view the clean BC image, or a raw writer or "
"raw image of other levels kept it");
if (viewed) (void)texture_cache.FindTexture(raw_image, raw);
}
// A write through a separate buffer must not replace untouched image
// texels with stale backing bytes. Exact-base writes still refresh it.
constexpr uint64_t buffer_alias_offset = 0x1a00000;