Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-16 15:00:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

DirectXTex: minor 'return null on failure' fix for CreateTexture/CreateSRV

Browse Source
This commit is contained in:
walbourn_cp 2013-06-25 12:35:05 -07:00
parent 32b06b3e5c
commit 27c91d3da7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DirectXTex/DirectXTexD3D11.cpp
View File

@ -358,6 +358,8 @@ HRESULT CreateTextureEx( ID3D11Device* pDevice, const Image* srcImages, size_t n
if ( !pDevice || !srcImages || !nimages || !ppResource ) if ( !pDevice || !srcImages || !nimages || !ppResource )
return E_INVALIDARG; return E_INVALIDARG;
*ppResource = nullptr;
if ( !metadata.mipLevels || !metadata.arraySize ) if ( !metadata.mipLevels || !metadata.arraySize )
return E_INVALIDARG; return E_INVALIDARG;
@ -556,6 +558,8 @@ HRESULT CreateShaderResourceViewEx( ID3D11Device* pDevice, const Image* srcImage
if ( !ppSRV ) if ( !ppSRV )
return E_INVALIDARG; return E_INVALIDARG;
*ppSRV = nullptr;
ScopedObject<ID3D11Resource> resource; ScopedObject<ID3D11Resource> resource;
HRESULT hr = CreateTextureEx( pDevice, srcImages, nimages, metadata, HRESULT hr = CreateTextureEx( pDevice, srcImages, nimages, metadata,
usage, bindFlags, cpuAccessFlags, miscFlags, forceSRGB, usage, bindFlags, cpuAccessFlags, miscFlags, forceSRGB,