From 9f53163e4bcac33dd1f6f0fb8f4b05ab116e2654 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 17 Dec 2019 09:50:41 +0000 Subject: [PATCH] Fix RGP begin/end markers without any padding --- renderdoc/driver/d3d12/d3d12_device.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp index b61768e84..135ae6c06 100644 --- a/renderdoc/driver/d3d12/d3d12_device.cpp +++ b/renderdoc/driver/d3d12/d3d12_device.cpp @@ -3305,7 +3305,11 @@ void WrappedID3D12Device::ReplayLog(uint32_t startEventID, uint32_t endEventID, if(!partial) { ID3D12GraphicsCommandList *beginList = GetNewList(); - D3D12MarkerRegion::Set(beginList, AMDRGPControl::GetBeginMarker()); + { + rdcwstr text = StringFormat::UTF82Wide(AMDRGPControl::GetBeginMarker()); + UINT size = (UINT)text.length() * sizeof(wchar_t); + beginList->SetMarker(0, text.c_str(), size); + } beginList->Close(); ExecuteLists(); } @@ -3366,7 +3370,11 @@ void WrappedID3D12Device::ReplayLog(uint32_t startEventID, uint32_t endEventID, // ensure all UAV writes have finished before subsequent work ID3D12GraphicsCommandList *list = GetNewList(); - D3D12MarkerRegion::Set(list, AMDRGPControl::GetEndMarker()); + { + rdcwstr text = StringFormat::UTF82Wide(AMDRGPControl::GetBeginMarker()); + UINT size = (UINT)text.length() * sizeof(wchar_t); + list->SetMarker(0, text.c_str(), size); + } D3D12_RESOURCE_BARRIER uavBarrier = {}; uavBarrier.Type = D3D12_RESOURCE_BARRIER_TYPE_UAV;