raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-20 02:47:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support raw buffer writes to sampled textures

Browse Source
This commit is contained in:
nmzik
2026-07-17 07:26:42 +02:00
parent 3726b0ae22
commit 13499502c9
3 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/host_gpu/renderer/bufferCache.cpp
+4 -4
View File
@@ -704,20 +704,20 @@ std::pair<VulkanBuffer*, uint64_t> BufferCache::ObtainBuffer(CommandBuffer* com
}
// Cache allocations are tracker-page aligned, but byte-disjoint buffers and images may share
// an edge page. Clean read-only buffer and image views may coexist; Kyty retains a hard failure
// when either cache owns newer GPU bytes. Only a formatted buffer write
// performs the image ownership transition below.
// when either cache owns newer GPU bytes. Writable buffers delegate the ownership transition
// to TextureCache, which distinguishes raw texture-data writes from formatted target paths.
if (m_texture_cache->HasPageOverlap(begin, end - begin) &&
m_texture_cache->HasRangeOverlap(vaddr, size)) {
const bool coherent_read = is_read && !is_written &&
!m_memory_tracker.IsRegionGpuModified(vaddr, size) &&
!m_texture_cache->HasGpuModifiedRangeOverlap(vaddr, size);
if (!coherent_read) {
if (!is_written || !is_formatted) {
if (!is_written) {
EXIT("BufferCache: unsupported buffer/image alias, addr=0x%016" PRIx64
" size=0x%016" PRIx64 " read=%d written=%d formatted=%d\n",
vaddr, size, is_read, is_written, is_formatted);
}
(void)m_texture_cache->InvalidateMemoryFromGPU(vaddr, size, true);
(void)m_texture_cache->InvalidateMemoryFromGPU(vaddr, size, is_formatted);
}
}
if (is_written) {
src/graphics/host_gpu/renderer/imageInfo.h
+9 -4
View File
@@ -442,11 +442,16 @@ ClassifyBufferImageWrite(uint64_t buffer_address, uint64_t buffer_size, uint64_t
if (!ImagePageRangesOverlap(buffer_address, buffer_size, image_address, image_size)) {
return BufferImageWrite::None;
}
const bool exact = buffer_address == image_address && buffer_size == image_size;
const bool page_aligned = ((buffer_address | buffer_size) & (TRACKER_PAGE_SIZE - 1)) == 0;
const bool exact = buffer_address == image_address && buffer_size == image_size;
const auto offset = buffer_address >= image_address ? buffer_address - image_address : UINT64_MAX;
const bool contained = offset <= image_size && buffer_size <= image_size - offset;
const bool buffer_page_aligned =
((buffer_address | buffer_size) & (TRACKER_PAGE_SIZE - 1)) == 0;
const bool image_page_aligned =
((image_address | image_size) & (TRACKER_PAGE_SIZE - 1)) == 0;
switch (binding) {
case BufferImageBinding::Texture:
return exact && page_aligned && !image_gpu_modified
return contained && image_page_aligned && !image_gpu_modified
? BufferImageWrite::InvalidateTexture
: BufferImageWrite::Unsupported;
case BufferImageBinding::VideoOut:
@@ -454,7 +459,7 @@ ClassifyBufferImageWrite(uint64_t buffer_address, uint64_t buffer_size, uint64_t
? BufferImageWrite::InvalidateVideoOut
: BufferImageWrite::Unsupported;
case BufferImageBinding::RenderTarget:
return exact && page_aligned && buffer_formatted && image_gpu_modified
return exact && buffer_page_aligned && buffer_formatted && image_gpu_modified
? BufferImageWrite::SynchronizeRenderTarget
: BufferImageWrite::Unsupported;
case BufferImageBinding::Unsupported: return BufferImageWrite::Unsupported;
tests/ShaderRecompilerComputeTests.cpp
+16 -1
View File
@@ -10361,8 +10361,23 @@ void CheckBufferImageWrites() {
Case{"sampled exact", sampled, sampled_size, sampled, sampled_size,
BufferImageBinding::Texture, false, false,
BufferImageWrite::InvalidateTexture},
Case{"sampled partial", sampled, sampled_size - TRACKER_PAGE_SIZE,
Case{"sampled contained prefix", sampled, sampled_size - TRACKER_PAGE_SIZE,
sampled, sampled_size, BufferImageBinding::Texture, false, false,
BufferImageWrite::InvalidateTexture},
Case{"sampled contained raw", sampled + 0x23030, 0xfa0, sampled,
sampled_size, BufferImageBinding::Texture, false, false,
BufferImageWrite::InvalidateTexture},
Case{"sampled prefix crossing", sampled - 0x10, 0x20, sampled,
sampled_size, BufferImageBinding::Texture, false, false,
BufferImageWrite::Unsupported},
Case{"sampled suffix crossing", sampled + sampled_size - 0x10, 0x20,
sampled, sampled_size, BufferImageBinding::Texture, false, false,
BufferImageWrite::Unsupported},
Case{"sampled contained GPU-owned", sampled + 0x23030, 0xfa0,
sampled, sampled_size, BufferImageBinding::Texture, true, false,
BufferImageWrite::Unsupported},
Case{"sampled contained unsupported", sampled + 0x23030, 0xfa0,
sampled, sampled_size, BufferImageBinding::Unsupported, false, false,
BufferImageWrite::Unsupported},
Case{"sampled unaligned", sampled + 1, sampled_size, sampled + 1,
sampled_size, BufferImageBinding::Texture, false, false,