Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-04 12:16:14 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Ex texture loaders updated with additional parameter validation (#142)

Browse Source
This commit is contained in:
Chuck Walbourn
2019-06-18 16:56:52 -07:00
committed by GitHub
parent a161b96dec
commit f55158d557
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
WICTextureLoader/WICTextureLoader.cpp
View File

@@ -818,7 +818,14 @@ HRESULT DirectX::CreateWICTextureFromMemoryEx(
}
if (!d3dDevice || !wicData || (!texture && !textureView))
{
return E_INVALIDARG;
}
if (textureView && !(bindFlags & D3D11_BIND_SHADER_RESOURCE))
{
return E_INVALIDARG;
}
if (!wicDataSize)
return E_FAIL;
@@ -951,7 +958,14 @@ HRESULT DirectX::CreateWICTextureFromFileEx(
}
if (!d3dDevice || !fileName || (!texture && !textureView))
{
return E_INVALIDARG;
}
if (textureView && !(bindFlags & D3D11_BIND_SHADER_RESOURCE))
{
return E_INVALIDARG;
}
auto pWIC = _GetWIC();
if (!pWIC)