mirror of
https://github.com/KytyPS5/KytyPS5.git
synced 2026-10-27 13:26:52 +01:00
Support raw buffer writes to sampled textures
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user