lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-26 16:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle NULL being passed to SetPrivateData/SetName

Browse Source
This commit is contained in:
baldurk
2018-03-07 11:26:10 +00:00
parent f03ece2128
commit e3b42b56af
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/d3d11_common.h
+1 -1
View File
@@ -182,7 +182,7 @@ template <class T>
inline void SetDebugName(T *pObj, const char *name)
{
if(pObj)
pObj->SetPrivateData(WKPDID_D3DDebugObjectName, (UINT)strlen(name), name);
pObj->SetPrivateData(WKPDID_D3DDebugObjectName, name ? (UINT)strlen(name) : 0, name);
}
template <class T>
renderdoc/driver/d3d11/d3d11_device.cpp
+1 -1
View File
@@ -2224,7 +2224,7 @@ bool WrappedID3D11Device::Serialise_SetResourceName(SerialiserType &ser,
{
ResourceDescription &descr = GetReplay()->GetResourceDesc(
GetResourceManager()->GetOriginalID(GetIDForResource(pResource)));
descr.SetCustomName(Name);
descr.SetCustomName(Name ? Name : "");
AddResourceCurChunk(descr);
SetDebugName(pResource, Name);
renderdoc/driver/d3d12/d3d12_device.cpp
+3 -3
View File
@@ -1945,13 +1945,13 @@ bool WrappedID3D12Device::Serialise_SetName(SerialiserType &ser, ID3D12DeviceChi
if(IsReplayingAndReading() && pResource)
{
ResourceId origId = GetResourceManager()->GetOriginalID(GetResID(pResource));
m_ResourceNames[origId] = Name;
m_ResourceNames[origId] = Name ? Name : "";
ResourceDescription &descr = GetReplay()->GetResourceDesc(origId);
descr.SetCustomName(Name);
descr.SetCustomName(Name ? Name : "");
AddResourceCurChunk(descr);
pResource->SetName(StringFormat::UTF82Wide(Name).c_str());
pResource->SetName(StringFormat::UTF82Wide(Name ? Name : "").c_str());
}
return true;
renderdoc/driver/d3d12/d3d12_resources.h
+1 -1
View File
@@ -288,7 +288,7 @@ public:
HRESULT STDMETHODCALLTYPE SetName(LPCWSTR Name)
{
string utf8 = StringFormat::Wide2UTF8(Name);
string utf8 = Name ? StringFormat::Wide2UTF8(Name) : "";
m_pDevice->SetName(this, utf8.c_str());
if(!m_pReal)