summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authormr.greywater <mr.greywater@googlemail.com>2015-02-09 13:14:45 +0100
committermr.greywater <mr.greywater@googlemail.com>2015-02-12 14:34:35 +0100
commitb5ffba3291a3298595d1b0165d415a1fce490fad (patch)
treeda810559e442c1819145834fc0a5747e889d9222 /Source/Core/VideoBackends
parent3d3a68a2f02d0fd667efce144e1b314e3e00305f (diff)
D3D: Added GetDebugObjectName and parameter checking in SetDebugObjectName
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/D3D/D3DBase.h21
1 files changed, 20 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/D3D/D3DBase.h b/Source/Core/VideoBackends/D3D/D3DBase.h
index 05190bd5d4..a0a629ac8a 100644
--- a/Source/Core/VideoBackends/D3D/D3DBase.h
+++ b/Source/Core/VideoBackends/D3D/D3DBase.h
@@ -70,10 +70,29 @@ void SetDebugObjectName(T resource, const char* name)
static_assert(std::is_convertible<T, ID3D11DeviceChild*>::value,
"resource must be convertible to ID3D11DeviceChild*");
#if defined(_DEBUG) || defined(DEBUGFAST)
- resource->SetPrivateData(WKPDID_D3DDebugObjectName, (UINT)strlen(name), name);
+ if (resource)
+ resource->SetPrivateData(WKPDID_D3DDebugObjectName, (UINT)(name ? strlen(name) : 0), name);
#endif
}
+template <typename T>
+std::string GetDebugObjectName(T resource)
+{
+ static_assert(std::is_convertible<T, ID3D11DeviceChild*>::value,
+ "resource must be convertible to ID3D11DeviceChild*");
+ std::string name;
+#if defined(_DEBUG) || defined(DEBUGFAST)
+ if (resource)
+ {
+ UINT size = 0;
+ resource->GetPrivateData(WKPDID_D3DDebugObjectName, &size, nullptr); //get required size
+ name.resize(size);
+ resource->GetPrivateData(WKPDID_D3DDebugObjectName, &size, const_cast<char*>(name.data()));
+ }
+#endif
+ return name;
+}
+
} // namespace D3D
typedef HRESULT (WINAPI* CREATEDXGIFACTORY)(REFIID, void**);