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

Fixes for 32-bit on D3D12

Browse Source
This commit is contained in:
baldurk
2017-03-07 12:46:53 +00:00
parent 23520b0ed9
commit e3f09210b3
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_debug.cpp
+4
View File
@@ -374,6 +374,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
// VS CBV
param.ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX;
param.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
param.Descriptor.RegisterSpace = 0;
param.Descriptor.ShaderRegister = 0;
param.Descriptor.Flags = D3D12_ROOT_DESCRIPTOR_FLAG_NONE;
@@ -458,6 +459,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
// 0: CBV
param.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
param.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
param.Descriptor.RegisterSpace = 0;
param.Descriptor.ShaderRegister = 0;
param.Descriptor.Flags = D3D12_ROOT_DESCRIPTOR_FLAG_NONE;
@@ -506,6 +508,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
// 0: CBV
param.ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL;
param.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
param.Descriptor.RegisterSpace = 0;
param.Descriptor.ShaderRegister = 0;
param.Descriptor.Flags = D3D12_ROOT_DESCRIPTOR_FLAG_NONE;
@@ -535,6 +538,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
// 0: CBV
param.ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
param.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
param.Descriptor.RegisterSpace = 0;
param.Descriptor.ShaderRegister = 0;
param.Descriptor.Flags = D3D12_ROOT_DESCRIPTOR_FLAG_NONE;
renderdoc/driver/d3d12/d3d12_manager.cpp
+4 -3
View File
@@ -899,14 +899,14 @@ bool D3D12ResourceManager::Serialise_InitialState(ResourceId resid, ID3D12Device
byte dummy[4] = {};
byte *ptr = NULL;
size_t size = 0;
uint64_t size = 0;
HRESULT hr = E_NOINTERFACE;
if(copiedBuffer)
{
hr = copiedBuffer->Map(0, NULL, (void **)&ptr);
size = (size_t)copiedBuffer->GetDesc().Width;
size = (uint64_t)copiedBuffer->GetDesc().Width;
}
if(FAILED(hr) || ptr == NULL)
@@ -918,7 +918,8 @@ bool D3D12ResourceManager::Serialise_InitialState(ResourceId resid, ID3D12Device
}
m_pSerialiser->Serialise("NumBytes", size);
m_pSerialiser->SerialiseBuffer("BufferData", ptr, size);
size_t sz = (size_t)size;
m_pSerialiser->SerialiseBuffer("BufferData", ptr, sz);
if(SUCCEEDED(hr) && ptr)
copiedBuffer->Unmap(0, NULL);