From 27c91d3da7e839a603c2cce247c13f7a70dd2049 Mon Sep 17 00:00:00 2001 From: walbourn_cp Date: Tue, 25 Jun 2013 12:35:05 -0700 Subject: [PATCH] DirectXTex: minor 'return null on failure' fix for CreateTexture/CreateSRV --- DirectXTex/DirectXTexD3D11.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DirectXTex/DirectXTexD3D11.cpp b/DirectXTex/DirectXTexD3D11.cpp index 1e276c3..68053aa 100644 --- a/DirectXTex/DirectXTexD3D11.cpp +++ b/DirectXTex/DirectXTexD3D11.cpp @@ -358,6 +358,8 @@ HRESULT CreateTextureEx( ID3D11Device* pDevice, const Image* srcImages, size_t n if ( !pDevice || !srcImages || !nimages || !ppResource ) return E_INVALIDARG; + *ppResource = nullptr; + if ( !metadata.mipLevels || !metadata.arraySize ) return E_INVALIDARG; @@ -556,6 +558,8 @@ HRESULT CreateShaderResourceViewEx( ID3D11Device* pDevice, const Image* srcImage if ( !ppSRV ) return E_INVALIDARG; + *ppSRV = nullptr; + ScopedObject resource; HRESULT hr = CreateTextureEx( pDevice, srcImages, nimages, metadata, usage, bindFlags, cpuAccessFlags, miscFlags, forceSRGB,