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

Support loading another DX10 DDS variant with permissive (#588)

Browse Source
This commit is contained in:
Chuck Walbourn 2025-02-20 11:59:09 -08:00 committed by GitHub
parent 71ab939f26
commit 75b08fb306
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
DirectXTex/DirectXTexDDS.cpp
View File

@ -2006,10 +2006,36 @@ HRESULT DirectX::LoadFromDDSMemoryEx(
return E_FAIL; return E_FAIL;
} }
size_t remaining = size - offset;
if (remaining == 0)
return E_FAIL;
hr = image.Initialize(mdata); hr = image.Initialize(mdata);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
if (flags & DDS_FLAGS_PERMISSIVE)
{
// For cubemaps, DDS_HEADER_DXT10.arraySize is supposed to be 'number of cubes'.
// This handles cases where the value is incorrectly written as the original 6*numCubes value.
if ((mdata.miscFlags & TEX_MISC_TEXTURECUBE)
&& (convFlags & CONV_FLAGS_DX10)
&& (image.GetPixelsSize() > remaining)
&& ((mdata.arraySize % 6) == 0))
{
mdata.arraySize = mdata.arraySize / 6;
hr = image.Initialize(mdata);
if (FAILED(hr))
return hr;
if (image.GetPixelsSize() > remaining)
{
image.Release();
return HRESULT_E_HANDLE_EOF;
}
}
}
CP_FLAGS cflags = CP_FLAGS_NONE; CP_FLAGS cflags = CP_FLAGS_NONE;
if (flags & DDS_FLAGS_LEGACY_DWORD) if (flags & DDS_FLAGS_LEGACY_DWORD)
{ {
@ -2195,6 +2221,28 @@ HRESULT DirectX::LoadFromDDSFileEx(
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
if (flags & DDS_FLAGS_PERMISSIVE)
{
// For cubemaps, DDS_HEADER_DXT10.arraySize is supposed to be 'number of cubes'.
// This handles cases where the value is incorrectly written as the original 6*numCubes value.
if ((mdata.miscFlags & TEX_MISC_TEXTURECUBE)
&& (convFlags & CONV_FLAGS_DX10)
&& (image.GetPixelsSize() > remaining)
&& ((mdata.arraySize % 6) == 0))
{
mdata.arraySize = mdata.arraySize / 6;
hr = image.Initialize(mdata);
if (FAILED(hr))
return hr;
if (image.GetPixelsSize() > remaining)
{
image.Release();
return HRESULT_E_HANDLE_EOF;
}
}
}
if ((convFlags & CONV_FLAGS_EXPAND) || (flags & (DDS_FLAGS_LEGACY_DWORD | DDS_FLAGS_BAD_DXTN_TAILS))) if ((convFlags & CONV_FLAGS_EXPAND) || (flags & (DDS_FLAGS_LEGACY_DWORD | DDS_FLAGS_BAD_DXTN_TAILS)))
{ {
std::unique_ptr<uint8_t[]> temp(new (std::nothrow) uint8_t[remaining]); std::unique_ptr<uint8_t[]> temp(new (std::nothrow) uint8_t[remaining]);
@ -2370,7 +2418,7 @@ HRESULT DirectX::SaveToDDSMemory(
size_t remaining = blob.GetBufferSize() - required; size_t remaining = blob.GetBufferSize() - required;
pDestination += required; pDestination += required;
if (!remaining) if (remaining == 0)
{ {
blob.Release(); blob.Release();
return E_FAIL; return E_FAIL;