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

Resync DDSTextureLoader, ScreenGrab, WICTextureLoader

Browse Source
This commit is contained in:
Chuck Walbourn
2018-08-02 15:24:25 -07:00
parent ba0280c500
commit 3f8b8d36b9
6 changed files with 155 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
DDSTextureLoader/DDSTextureLoader.cpp
View File

@@ -851,13 +851,10 @@ namespace
size_t d = depth;
for (size_t i = 0; i < mipCount; i++)
{
GetSurfaceInfo(w,
h,
format,
&NumBytes,
&RowBytes,
nullptr
);
GetSurfaceInfo(w, h, format, &NumBytes, &RowBytes, nullptr);
if (NumBytes > UINT32_MAX || RowBytes > UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
if ((mipCount <= 1) || !maxsize || (w <= maxsize && h <= maxsize && d <= maxsize))
{
@@ -959,9 +956,9 @@ namespace
initData,
&tex
);
if (SUCCEEDED(hr) && tex != 0)
if (SUCCEEDED(hr) && tex)
{
if (textureView != 0)
if (textureView)
{
D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc = {};
SRVDesc.Format = format;
@@ -989,7 +986,7 @@ namespace
}
}
if (texture != 0)
if (texture)
{
*texture = tex;
}
@@ -1029,9 +1026,9 @@ namespace
initData,
&tex
);
if (SUCCEEDED(hr) && tex != 0)
if (SUCCEEDED(hr) && tex)
{
if (textureView != 0)
if (textureView)
{
D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc = {};
SRVDesc.Format = format;
@@ -1075,7 +1072,7 @@ namespace
}
}
if (texture != 0)
if (texture)
{
*texture = tex;
}
@@ -1106,9 +1103,9 @@ namespace
initData,
&tex
);
if (SUCCEEDED(hr) && tex != 0)
if (SUCCEEDED(hr) && tex)
{
if (textureView != 0)
if (textureView)
{
D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc = {};
SRVDesc.Format = format;
@@ -1127,7 +1124,7 @@ namespace
}
}
if (texture != 0)
if (texture)
{
*texture = tex;
}
@@ -1308,8 +1305,8 @@ namespace
}
}
else if ((arraySize > D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION) ||
(width > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION) ||
(height > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION))
(width > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION) ||
(height > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION))
{
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
}
@@ -1330,7 +1327,7 @@ namespace
}
bool autogen = false;
if (mipCount == 1 && d3dContext != 0 && textureView != 0) // Must have context and shader-view to auto generate mipmaps
if (mipCount == 1 && d3dContext && textureView) // Must have context and shader-view to auto generate mipmaps
{
// See if format is supported for auto-gen mipmaps (varies by feature level)
UINT fmtSupport = 0;
@@ -1370,6 +1367,9 @@ namespace
return HRESULT_FROM_WIN32(ERROR_HANDLE_EOF);
}
if (numBytes > UINT32_MAX || rowBytes > UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
D3D11_SHADER_RESOURCE_VIEW_DESC desc;
(*textureView)->GetDesc(&desc);
@@ -1653,12 +1653,12 @@ HRESULT DirectX::CreateDDSTextureFromMemoryEx(ID3D11Device* d3dDevice,
texture, textureView);
if (SUCCEEDED(hr))
{
if (texture != 0 && *texture != 0)
if (texture && *texture)
{
SetDebugObjectName(*texture, "DDSTextureLoader");
}
if (textureView != 0 && *textureView != 0)
if (textureView && *textureView)
{
SetDebugObjectName(*textureView, "DDSTextureLoader");
}
@@ -1772,7 +1772,7 @@ HRESULT DirectX::CreateDDSTextureFromFileEx(ID3D11Device* d3dDevice,
if (SUCCEEDED(hr))
{
#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
if (texture != 0 || textureView != 0)
if (texture || textureView)
{
CHAR strFileA[MAX_PATH];
int result = WideCharToMultiByte(CP_ACP,
@@ -1796,7 +1796,7 @@ HRESULT DirectX::CreateDDSTextureFromFileEx(ID3D11Device* d3dDevice,
pstrName++;
}
if (texture != 0 && *texture != 0)
if (texture && *texture)
{
(*texture)->SetPrivateData(WKPDID_D3DDebugObjectName,
static_cast<UINT>(strnlen_s(pstrName, MAX_PATH)),
@@ -1804,7 +1804,7 @@ HRESULT DirectX::CreateDDSTextureFromFileEx(ID3D11Device* d3dDevice,
);
}
if (textureView != 0 && *textureView != 0)
if (textureView && *textureView)
{
(*textureView)->SetPrivateData(WKPDID_D3DDebugObjectName,
static_cast<UINT>(strnlen_s(pstrName, MAX_PATH)),

23
DDSTextureLoader/DDSTextureLoader12.cpp
View File

@@ -930,13 +930,10 @@ namespace
size_t d = depth;
for (size_t i = 0; i < mipCount; i++)
{
GetSurfaceInfo(w,
h,
format,
&NumBytes,
&RowBytes,
nullptr
);
GetSurfaceInfo(w, h, format, &NumBytes, &RowBytes, nullptr);
if (NumBytes > UINT32_MAX || RowBytes > UINT32_MAX)
return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
if ((mipCount <= 1) || !maxsize || (w <= maxsize && h <= maxsize && d <= maxsize))
{
@@ -1040,7 +1037,7 @@ namespace
IID_PPV_ARGS(texture));
if (SUCCEEDED(hr))
{
_Analysis_assume_(*texture != 0);
_Analysis_assume_(*texture != nullptr);
SetDebugObjectName(*texture, L"DDSTextureLoader");
}
@@ -1207,8 +1204,8 @@ namespace
}
}
else if ((arraySize > D3D12_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION) ||
(width > D3D12_REQ_TEXTURE2D_U_OR_V_DIMENSION) ||
(height > D3D12_REQ_TEXTURE2D_U_OR_V_DIMENSION))
(width > D3D12_REQ_TEXTURE2D_U_OR_V_DIMENSION) ||
(height > D3D12_REQ_TEXTURE2D_U_OR_V_DIMENSION))
{
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
}
@@ -1434,7 +1431,7 @@ HRESULT DirectX::LoadDDSTextureFromMemoryEx(
texture, subresources, isCubeMap);
if (SUCCEEDED(hr))
{
if (texture != 0 && *texture != 0)
if (texture && *texture)
{
SetDebugObjectName(*texture, L"DDSTextureLoader");
}
@@ -1526,7 +1523,7 @@ HRESULT DirectX::LoadDDSTextureFromFileEx(
if (SUCCEEDED(hr))
{
#if !defined(NO_D3D12_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
if (texture != 0)
if (texture)
{
CHAR strFileA[MAX_PATH];
int result = WideCharToMultiByte(CP_ACP,
@@ -1550,7 +1547,7 @@ HRESULT DirectX::LoadDDSTextureFromFileEx(
pstrName++;
}
if (texture != 0 && *texture != 0)
if (texture && *texture)
{
(*texture)->SetName(pstrName);
}