diff options
| author | Mathew Maidment <mathew1800@gmail.com> | 2016-02-15 23:03:20 -0500 |
|---|---|---|
| committer | Mathew Maidment <mathew1800@gmail.com> | 2016-02-15 23:03:20 -0500 |
| commit | 2c5fcad5f5970404ec416fb30a50be4cdc654034 (patch) | |
| tree | 5fdf4e9006f2b6bcce51a5a2d7ac1293a5855f91 /Source | |
| parent | 05f5668bcc19dd5c5ae77eea2d44139bdbf9c585 (diff) | |
| parent | a22f2e11445ae8fba0b948e1f369c192b3963b3f (diff) | |
Merge pull request #3641 from lioncash/return
D3DBase: Fix missing return statement
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/VideoBackends/D3D12/D3DBase.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/VideoBackends/D3D12/D3DBase.h b/Source/Core/VideoBackends/D3D12/D3DBase.h index b3ae9555a1..f8a61ad793 100644 --- a/Source/Core/VideoBackends/D3D12/D3DBase.h +++ b/Source/Core/VideoBackends/D3D12/D3DBase.h @@ -129,6 +129,7 @@ static void SetDebugObjectName12(ID3D12Resource* resource, LPCSTR name) static std::string GetDebugObjectName12(ID3D12Resource* resource) { std::string name; + if (resource) { UINT size = 0; @@ -136,6 +137,8 @@ static std::string GetDebugObjectName12(ID3D12Resource* resource) name.resize(size); resource->GetPrivateData(WKPDID_D3DDebugObjectName, &size, const_cast<char*>(name.data())); } + + return name; } } // namespace D3D |