ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

also use vastcpy for shared memory page stuff

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,14 +406,15 @@ 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;
} }
CommitUAVWritesAndTransitionBuffer(D3D12_RESOURCE_STATE_COPY_DEST); CommitUAVWritesAndTransitionBuffer(D3D12_RESOURCE_STATE_COPY_DEST);
command_processor_.SubmitBarriers(); command_processor_.SubmitBarriers();
auto& command_list = command_processor_.GetDeferredCommandList(); auto& command_list = command_processor_.GetDeferredCommandList();
//for (auto upload_range : upload_page_ranges) { // for (auto upload_range : upload_page_ranges) {
for (unsigned int i = 0; i < num_upload_page_ranges; ++i) { for (unsigned int i = 0; i < num_upload_page_ranges; ++i) {
auto& upload_range = upload_page_ranges[i]; auto& upload_range = upload_page_ranges[i];
uint32_t upload_range_start = upload_range.first; uint32_t upload_range_start = upload_range.first;
@ -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(
upload_buffer_mapping, if (upload_buffer_size < (1ULL << 32) && upload_buffer_size > 8192) {
memory().TranslatePhysical(upload_range_start << page_size_log2()), dma::vastcpy(
upload_buffer_size); 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,
memory().TranslatePhysical(upload_range_start << page_size_log2()),
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));