lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Win32 compile fixes

Browse Source
This commit is contained in:
baldurk
2016-07-10 20:21:25 +02:00
parent 8bcb9ae249
commit b260e47c2e
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_debug.cpp
+2 -2
View File
@@ -643,11 +643,11 @@ uint64_t D3D12DebugManager::MakeOutputWindow(void *w, bool depth)
outw.bbIdx = 0;
outw.rtv = rtvHeap->GetCPUDescriptorHandleForHeapStart();
outw.rtv.ptr += m_OutputWindowID *
outw.rtv.ptr += SIZE_T(m_OutputWindowID) *
m_WrappedDevice->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
outw.dsv = dsvHeap->GetCPUDescriptorHandleForHeapStart();
outw.dsv.ptr += m_OutputWindowID *
outw.dsv.ptr += SIZE_T(m_OutputWindowID) *
m_WrappedDevice->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_DSV);
outw.col = NULL;
renderdoc/driver/d3d12/d3d12_manager.cpp
+6 -4
View File
@@ -410,14 +410,14 @@ bool D3D12ResourceManager::Serialise_InitialState(ResourceId resid, ID3D12Device
byte dummy[4] = {};
byte *ptr = NULL;
uint64_t size = 0;
size_t size = 0;
HRESULT hr = E_NOINTERFACE;
if(copySrc)
{
hr = copySrc->Map(0, NULL, (void **)&ptr);
size = copySrc->GetDesc().Width;
size = (size_t)copySrc->GetDesc().Width;
}
if(FAILED(hr) || ptr == NULL)
@@ -544,7 +544,9 @@ bool D3D12ResourceManager::Serialise_InitialState(ResourceId resid, ID3D12Device
ptr = NULL;
}
m_pSerialiser->SerialiseBuffer("BufferData", ptr, size);
size_t sz = (size_t)size;
m_pSerialiser->SerialiseBuffer("BufferData", ptr, sz);
if(SUCCEEDED(hr))
copySrc->Unmap(0, NULL);
@@ -644,7 +646,7 @@ void D3D12ResourceManager::Apply_InitialState(ID3D12DeviceChild *live, InitialCo
}
if(src && dst)
memcpy(dst, src, copySrc->GetDesc().Width);
memcpy(dst, src, (size_t)copySrc->GetDesc().Width);
if(src)
copySrc->Unmap(0, NULL);