Merge pull request #3641 from lioncash/return

D3DBase: Fix missing return statement
This commit is contained in:
Mathew Maidment 2016-02-15 23:03:20 -05:00
commit 2c5fcad5f5
1 changed files with 3 additions and 0 deletions

View File

@ -129,6 +129,7 @@ static void SetDebugObjectName12(ID3D12Resource* resource, LPCSTR name)
static std::string GetDebugObjectName12(ID3D12Resource* resource) static std::string GetDebugObjectName12(ID3D12Resource* resource)
{ {
std::string name; std::string name;
if (resource) if (resource)
{ {
UINT size = 0; UINT size = 0;
@ -136,6 +137,8 @@ static std::string GetDebugObjectName12(ID3D12Resource* resource)
name.resize(size); name.resize(size);
resource->GetPrivateData(WKPDID_D3DDebugObjectName, &size, const_cast<char*>(name.data())); resource->GetPrivateData(WKPDID_D3DDebugObjectName, &size, const_cast<char*>(name.data()));
} }
return name;
} }
} // namespace D3D } // namespace D3D