diff --git a/DDSTextureLoader/DDSTextureLoader12.cpp b/DDSTextureLoader/DDSTextureLoader12.cpp index f7af781..87335ff 100644 --- a/DDSTextureLoader/DDSTextureLoader12.cpp +++ b/DDSTextureLoader/DDSTextureLoader12.cpp @@ -1539,23 +1539,19 @@ namespace //-------------------------------------------------------------------------------------- void SetDebugTextureInfo( _In_z_ const wchar_t* fileName, - _In_ ID3D12Resource** texture) noexcept + _In_ ID3D12Resource* texture) noexcept { #if !defined(NO_D3D12_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) ) - if (texture && *texture) + const wchar_t* pstrName = wcsrchr(fileName, '\\'); + if (!pstrName) { - const wchar_t* pstrName = wcsrchr(fileName, '\\'); - if (!pstrName) - { - pstrName = fileName; - } - else - { - pstrName++; - } - - (*texture)->SetName(pstrName); + pstrName = fileName; } + else + { + pstrName++; + } + texture->SetName(pstrName); #else UNREFERENCED_PARAMETER(fileName); UNREFERENCED_PARAMETER(texture); @@ -1643,10 +1639,7 @@ HRESULT DirectX::LoadDDSTextureFromMemoryEx( texture, subresources, isCubeMap); if (SUCCEEDED(hr)) { - if (texture && *texture) - { - SetDebugObjectName(*texture, L"DDSTextureLoader"); - } + SetDebugObjectName(*texture, L"DDSTextureLoader"); if (alphaMode) *alphaMode = GetAlphaMode(header); @@ -1734,7 +1727,7 @@ HRESULT DirectX::LoadDDSTextureFromFileEx( if (SUCCEEDED(hr)) { - SetDebugTextureInfo(fileName, texture); + SetDebugTextureInfo(fileName, *texture); if (alphaMode) *alphaMode = GetAlphaMode(header); diff --git a/WICTextureLoader/WICTextureLoader12.cpp b/WICTextureLoader/WICTextureLoader12.cpp index 42dec1a..8c1293d 100644 --- a/WICTextureLoader/WICTextureLoader12.cpp +++ b/WICTextureLoader/WICTextureLoader12.cpp @@ -640,23 +640,19 @@ namespace //-------------------------------------------------------------------------------------- void SetDebugTextureInfo( _In_z_ const wchar_t* fileName, - _In_ ID3D12Resource** texture) noexcept + _In_ ID3D12Resource* texture) noexcept { #if !defined(NO_D3D12_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) ) - if (texture && *texture) + const wchar_t* pstrName = wcsrchr(fileName, '\\'); + if (!pstrName) { - const wchar_t* pstrName = wcsrchr(fileName, '\\'); - if (!pstrName) - { - pstrName = fileName; - } - else - { - pstrName++; - } - - (*texture)->SetName(pstrName); + pstrName = fileName; } + else + { + pstrName++; + } + texture->SetName(pstrName); #else UNREFERENCED_PARAMETER(fileName); UNREFERENCED_PARAMETER(texture); @@ -822,7 +818,7 @@ HRESULT DirectX::LoadWICTextureFromFileEx( if (SUCCEEDED(hr)) { - SetDebugTextureInfo(fileName, texture); + SetDebugTextureInfo(fileName, *texture); } return hr;