lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-21 05:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

32-bit compile fixes with 64-bit buffer lengths and offsets

Browse Source
This commit is contained in:
baldurk
2016-09-23 16:33:44 +02:00
parent a88e0067b4
commit e22e813049
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_debug.cpp
+10 -4
View File
@@ -1793,14 +1793,20 @@ void D3D12DebugManager::GetBufferData(ID3D12Resource *buffer, uint64_t offset, u
length = RDCMIN(length, desc.Width - offset);
}
if(sizeof(size_t) == sizeof(uint32_t) && offset + length > 0xfffffff)
{
RDCERR("Trying to read back too much data on 32-bit build. Try running on 64-bit.");
return;
}
uint64_t outOffs = 0;
ret.resize(length);
ret.resize((size_t)length);
// directly CPU mappable (and possibly invalid to transition and copy from), so just memcpy
if(heapProps.Type == D3D12_HEAP_TYPE_UPLOAD || heapProps.Type == D3D12_HEAP_TYPE_READBACK)
{
D3D12_RANGE range = {offset, offset + length};
D3D12_RANGE range = {(size_t)offset, size_t(offset + length)};
byte *data = NULL;
HRESULT hr = buffer->Map(0, &range, (void **)&data);
@@ -1841,7 +1847,7 @@ void D3D12DebugManager::GetBufferData(ID3D12Resource *buffer, uint64_t offset, u
m_WrappedDevice->ExecuteLists();
m_WrappedDevice->FlushLists();
D3D12_RANGE range = {0, chunkSize};
D3D12_RANGE range = {0, (size_t)chunkSize};
void *data = NULL;
HRESULT hr = m_ReadbackBuffer->Map(0, &range, &data);
@@ -1853,7 +1859,7 @@ void D3D12DebugManager::GetBufferData(ID3D12Resource *buffer, uint64_t offset, u
}
else
{
memcpy(&ret[outOffs], data, chunkSize);
memcpy(&ret[outOffs], data, (size_t)chunkSize);
range.End = 0;