mirror of
https://github.com/microsoft/DirectXTex.git
synced 2026-02-04 04:16:12 +01:00
Support loading yet another DX10 DDS variant with permissive (#668)
Some checks failed
CMake (Windows on ARM64) / build (arm64-Debug-UWP) (push) Waiting to run
CMake (Windows on ARM64) / build (arm64-Release) (push) Waiting to run
CMake (Windows on ARM64) / build (arm64-Release-UWP) (push) Waiting to run
CMake (Windows on ARM64) / build (arm64-Debug) (push) Waiting to run
BVTs (arm64) / build (arm64-Release) (push) Waiting to run
BVTs (x64) / build (amd64, x64-Release, 14) (push) Waiting to run
BVTs (x64) / build (amd64, x64-Release, 14.29) (push) Waiting to run
CodeQL / Analyze (C/C++) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug, 14) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug, 14.29) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug-Clang, 14) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug-Win8, 14) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release, 14) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release, 14.29) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release-Clang, 14) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release-Win8, 14) (push) Waiting to run
Microsoft C++ Code Analysis / Analyze (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64-Debug, 14) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64-Debug-Clang, 14) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64-Release, 14) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64-Release-Clang, 14) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64ec-Debug, 14) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64ec-Release, 14) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Debug, 14) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Debug, 14.29) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Debug-Clang, 14) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Release, 14) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Release, 14.29) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Release-Clang, 14) (push) Waiting to run
MSBuild / build (Debug, ARM64, 2022) (push) Waiting to run
MSBuild / build (Debug, x64, 2019) (push) Waiting to run
MSBuild / build (Debug, x64, 2022) (push) Waiting to run
MSBuild / build (Debug, x86, 2019) (push) Waiting to run
MSBuild / build (Debug, x86, 2022) (push) Waiting to run
MSBuild / build (Release, ARM64, 2022) (push) Waiting to run
MSBuild / build (Release, x64, 2019) (push) Waiting to run
MSBuild / build (Release, x64, 2022) (push) Waiting to run
MSBuild / build (Release, x86, 2019) (push) Waiting to run
MSBuild / build (Release, x86, 2022) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-Clang-VCPKG, OFF, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-MinGW, OFF, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-MinGW, ON, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-VCPKG, OFF, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-VCPKG, OFF, 14.29) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Release-MinGW, OFF, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Release-MinGW, ON, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64_arm64, arm64-Debug-VCPKG, OFF, 14) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Release, 14.29) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Release-Clang, 14) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Debug, 14) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Debug, 14.29) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Debug-Clang, 14) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Release, 14) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Release, 14.29) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Release-Clang, 14) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64-Debug, 14) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64-Release, 14) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64ec-Debug, 14) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64ec-Release, 14) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Debug, 14) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Debug, 14.29) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Debug-Clang, 14) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Release, 14) (push) Waiting to run
CMake (UWP) / build (amd64, x64-Debug-UWP) (push) Waiting to run
CMake (UWP) / build (amd64, x64-Debug-UWP-Clang) (push) Waiting to run
CMake (UWP) / build (amd64, x64-Release-UWP) (push) Waiting to run
CMake (UWP) / build (amd64, x64-Release-UWP-Clang) (push) Waiting to run
CMake (UWP) / build (amd64_arm64, arm64-Debug-UWP) (push) Waiting to run
CMake (UWP) / build (amd64_arm64, arm64-Debug-UWP-Clang) (push) Waiting to run
CMake (UWP) / build (amd64_arm64, arm64-Release-UWP) (push) Waiting to run
CMake (UWP) / build (amd64_arm64, arm64-Release-UWP-Clang) (push) Waiting to run
CMake (UWP) / build (amd64_x86, x86-Debug-UWP) (push) Waiting to run
CMake (UWP) / build (amd64_x86, x86-Debug-UWP-Clang) (push) Waiting to run
CMake (UWP) / build (amd64_x86, x86-Release-UWP) (push) Waiting to run
CMake (UWP) / build (amd64_x86, x86-Release-UWP-Clang) (push) Waiting to run
CMake (WSL) / build (x64-Debug-Linux, 14) (push) Failing after 4s
CMake (Windows using VCPKG) / build (amd64_arm64, arm64ec-Debug-VCPKG, OFF, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64_x86, x86-Debug-VCPKG, OFF, 14) (push) Waiting to run
CMake (WSL) / build (x64-Debug-Linux, 13) (push) Failing after 4s
CMake (WSL) / build (x64-Debug-Linux, 12) (push) Failing after 4s
CMake (WSL) / build (x64-Release-Linux, 12) (push) Failing after 3s
CMake (WSL) / build (x64-Release-Linux, 13) (push) Failing after 4s
CMake (WSL) / build (x64-Release-Linux, 14) (push) Failing after 3s
Some checks failed
CMake (Windows on ARM64) / build (arm64-Debug-UWP) (push) Waiting to run
CMake (Windows on ARM64) / build (arm64-Release) (push) Waiting to run
CMake (Windows on ARM64) / build (arm64-Release-UWP) (push) Waiting to run
CMake (Windows on ARM64) / build (arm64-Debug) (push) Waiting to run
BVTs (arm64) / build (arm64-Release) (push) Waiting to run
BVTs (x64) / build (amd64, x64-Release, 14) (push) Waiting to run
BVTs (x64) / build (amd64, x64-Release, 14.29) (push) Waiting to run
CodeQL / Analyze (C/C++) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug, 14) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug, 14.29) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug-Clang, 14) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug-Win8, 14) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release, 14) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release, 14.29) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release-Clang, 14) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release-Win8, 14) (push) Waiting to run
Microsoft C++ Code Analysis / Analyze (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64-Debug, 14) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64-Debug-Clang, 14) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64-Release, 14) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64-Release-Clang, 14) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64ec-Debug, 14) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64ec-Release, 14) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Debug, 14) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Debug, 14.29) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Debug-Clang, 14) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Release, 14) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Release, 14.29) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Release-Clang, 14) (push) Waiting to run
MSBuild / build (Debug, ARM64, 2022) (push) Waiting to run
MSBuild / build (Debug, x64, 2019) (push) Waiting to run
MSBuild / build (Debug, x64, 2022) (push) Waiting to run
MSBuild / build (Debug, x86, 2019) (push) Waiting to run
MSBuild / build (Debug, x86, 2022) (push) Waiting to run
MSBuild / build (Release, ARM64, 2022) (push) Waiting to run
MSBuild / build (Release, x64, 2019) (push) Waiting to run
MSBuild / build (Release, x64, 2022) (push) Waiting to run
MSBuild / build (Release, x86, 2019) (push) Waiting to run
MSBuild / build (Release, x86, 2022) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-Clang-VCPKG, OFF, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-MinGW, OFF, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-MinGW, ON, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-VCPKG, OFF, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-VCPKG, OFF, 14.29) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Release-MinGW, OFF, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Release-MinGW, ON, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64_arm64, arm64-Debug-VCPKG, OFF, 14) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Release, 14.29) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Release-Clang, 14) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Debug, 14) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Debug, 14.29) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Debug-Clang, 14) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Release, 14) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Release, 14.29) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Release-Clang, 14) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64-Debug, 14) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64-Release, 14) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64ec-Debug, 14) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64ec-Release, 14) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Debug, 14) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Debug, 14.29) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Debug-Clang, 14) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Release, 14) (push) Waiting to run
CMake (UWP) / build (amd64, x64-Debug-UWP) (push) Waiting to run
CMake (UWP) / build (amd64, x64-Debug-UWP-Clang) (push) Waiting to run
CMake (UWP) / build (amd64, x64-Release-UWP) (push) Waiting to run
CMake (UWP) / build (amd64, x64-Release-UWP-Clang) (push) Waiting to run
CMake (UWP) / build (amd64_arm64, arm64-Debug-UWP) (push) Waiting to run
CMake (UWP) / build (amd64_arm64, arm64-Debug-UWP-Clang) (push) Waiting to run
CMake (UWP) / build (amd64_arm64, arm64-Release-UWP) (push) Waiting to run
CMake (UWP) / build (amd64_arm64, arm64-Release-UWP-Clang) (push) Waiting to run
CMake (UWP) / build (amd64_x86, x86-Debug-UWP) (push) Waiting to run
CMake (UWP) / build (amd64_x86, x86-Debug-UWP-Clang) (push) Waiting to run
CMake (UWP) / build (amd64_x86, x86-Release-UWP) (push) Waiting to run
CMake (UWP) / build (amd64_x86, x86-Release-UWP-Clang) (push) Waiting to run
CMake (WSL) / build (x64-Debug-Linux, 14) (push) Failing after 4s
CMake (Windows using VCPKG) / build (amd64_arm64, arm64ec-Debug-VCPKG, OFF, 14) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64_x86, x86-Debug-VCPKG, OFF, 14) (push) Waiting to run
CMake (WSL) / build (x64-Debug-Linux, 13) (push) Failing after 4s
CMake (WSL) / build (x64-Debug-Linux, 12) (push) Failing after 4s
CMake (WSL) / build (x64-Release-Linux, 12) (push) Failing after 3s
CMake (WSL) / build (x64-Release-Linux, 13) (push) Failing after 4s
CMake (WSL) / build (x64-Release-Linux, 14) (push) Failing after 3s
This commit is contained in:
@@ -433,6 +433,22 @@ namespace
|
|||||||
metadata.dimension = TEX_DIMENSION_TEXTURE1D;
|
metadata.dimension = TEX_DIMENSION_TEXTURE1D;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 0 /* D3Dxx_RESOURCE_DIMENSION_UNKNOWN */:
|
||||||
|
if (!(flags & DDS_FLAGS_PERMISSIVE))
|
||||||
|
{
|
||||||
|
return HRESULT_E_INVALID_DATA;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Known variant which assumes it is a 2D texture
|
||||||
|
|
||||||
|
#if (__cplusplus >= 201703L)
|
||||||
|
[[fallthrough]];
|
||||||
|
#elif defined(__clang__)
|
||||||
|
[[clang::fallthrough]];
|
||||||
|
#elif defined(_MSC_VER)
|
||||||
|
__fallthrough;
|
||||||
|
#endif
|
||||||
|
|
||||||
case DDS_DIMENSION_TEXTURE2D:
|
case DDS_DIMENSION_TEXTURE2D:
|
||||||
if (d3d10ext->miscFlag & DDS_RESOURCE_MISC_TEXTURECUBE)
|
if (d3d10ext->miscFlag & DDS_RESOURCE_MISC_TEXTURECUBE)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user