fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

also use vastcpy for shared memory page stuff

Browse Source
This commit is contained in:
chss95cs@gmail.com
2022-08-28 14:52:12 -07:00
parent f31869092c
commit 78c9a48bc2
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/xenia/gpu/d3d12/d3d12_shared_memory.cc
View File

@@ -406,7 +406,8 @@ bool D3D12SharedMemory::AllocateSparseHostGpuMemoryRange(
} }
bool D3D12SharedMemory::UploadRanges( bool D3D12SharedMemory::UploadRanges(
const std::pair<uint32_t, uint32_t>* upload_page_ranges, unsigned num_upload_page_ranges) { const std::pair<uint32_t, uint32_t>* upload_page_ranges,
unsigned num_upload_page_ranges) {
if (!num_upload_page_ranges) { if (!num_upload_page_ranges) {
return true; return true;
} }
@@ -434,10 +435,20 @@ bool D3D12SharedMemory::UploadRanges(
} }
MakeRangeValid(upload_range_start << page_size_log2(), MakeRangeValid(upload_range_start << page_size_log2(),
uint32_t(upload_buffer_size), false, false); uint32_t(upload_buffer_size), false, false);
std::memcpy(
if (upload_buffer_size < (1ULL << 32) && upload_buffer_size > 8192) {
dma::vastcpy(
upload_buffer_mapping,
memory().TranslatePhysical(upload_range_start << page_size_log2()),
static_cast<uint32_t>(upload_buffer_size));
swcache::WriteFence();
} else {
memcpy(
upload_buffer_mapping, upload_buffer_mapping,
memory().TranslatePhysical(upload_range_start << page_size_log2()), memory().TranslatePhysical(upload_range_start << page_size_log2()),
upload_buffer_size); upload_buffer_size);
}
command_list.D3DCopyBufferRegion( command_list.D3DCopyBufferRegion(
buffer_, upload_range_start << page_size_log2(), upload_buffer, buffer_, upload_range_start << page_size_log2(), upload_buffer,
UINT64(upload_buffer_offset), UINT64(upload_buffer_size)); UINT64(upload_buffer_offset), UINT64(upload_buffer_size));