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

Add safety code for now, to handle unwrapping non-wrapped resources

Browse Source
This commit is contained in:
baldurk
2016-07-05 19:21:46 +03:00
parent d656511d0f
commit f8fa72c305
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_resources.h
+20 -5
View File
@@ -546,7 +546,7 @@ ALL_D3D12_TYPES;
ResourceType IdentifyTypeByPtr(ID3D12DeviceChild *ptr);
#define WRAPPING_DEBUG 0
#define WRAPPING_DEBUG 1
template <typename iface>
typename UnwrapHelper<iface>::Outer *GetWrapped(iface *obj)
@@ -559,7 +559,7 @@ typename UnwrapHelper<iface>::Outer *GetWrapped(iface *obj)
#if WRAPPING_DEBUG
if(obj != NULL && !wrapped->IsAlloc(wrapped))
{
RDCERR("Trying to unwrap invalid type");
RDCWARN("Trying to unwrap invalid type");
return NULL;
}
#endif
@@ -578,7 +578,12 @@ iface *Unwrap(iface *obj)
if(obj == NULL)
return NULL;
return GetWrapped(obj)->GetReal();
auto wrapped = GetWrapped(obj);
if(wrapped)
return wrapped->GetReal();
return NULL;
}
template <typename iface>
@@ -587,7 +592,12 @@ ResourceId GetResID(iface *obj)
if(obj == NULL)
return ResourceId();
return GetWrapped(obj)->GetResourceID();
auto wrapped = GetWrapped(obj);
if(wrapped)
return wrapped->GetResourceID();
return ResourceId();
}
template <typename iface>
@@ -596,7 +606,12 @@ D3D12ResourceRecord *GetRecord(iface *obj)
if(obj == NULL)
return NULL;
return GetWrapped(obj)->GetResourceRecord();
auto wrapped = GetWrapped(obj);
if(wrapped)
return wrapped->GetResourceRecord();
return NULL;
}
// specialisations that use the GetTracked() function to fetch the ID