diff --git a/.nuget/directxtex_desktop_2019.nuspec b/.nuget/directxtex_desktop_2019.nuspec index 9f17efb..d93eeec 100644 --- a/.nuget/directxtex_desktop_2019.nuspec +++ b/.nuget/directxtex_desktop_2019.nuspec @@ -10,7 +10,7 @@ This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022 and supports Windows 7 / DirectX 11. DirectXTex, a shared source library for reading and writing .DDS files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and .HDR readers and writers since these image file format are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec. - Matches the September 1, 2023 release on GitHub. + Matches the October 28, 2023 release on GitHub. http://go.microsoft.com/fwlink/?LinkId=248926 images\icon.jpg diff --git a/.nuget/directxtex_desktop_win10.nuspec b/.nuget/directxtex_desktop_win10.nuspec index 4c24781..5959b4a 100644 --- a/.nuget/directxtex_desktop_win10.nuspec +++ b/.nuget/directxtex_desktop_win10.nuspec @@ -10,7 +10,7 @@ This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022 and supports Windows 10 / Windows 11 including both DirectX 11 and DirectX 12. DirectXTex, a shared source library for reading and writing .DDS files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and .HDR readers and writers since these image file format are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec. - Matches the September 1, 2023 release on GitHub. + Matches the October 28, 2023 release on GitHub. http://go.microsoft.com/fwlink/?LinkId=248926 images\icon.jpg diff --git a/.nuget/directxtex_uwp.nuspec b/.nuget/directxtex_uwp.nuspec index 11e1d60..3608510 100644 --- a/.nuget/directxtex_uwp.nuspec +++ b/.nuget/directxtex_uwp.nuspec @@ -10,7 +10,7 @@ This version is for Universal Windows Platform apps on Windows 10 / Windows 11 using Visual Studio 2019 (16.11) or Visual Studio 2022. DirectXTex, a shared source library for reading and writing .DDS files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and .HDR readers and writers since these image file format are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec. - Matches the September 1, 2023 release on GitHub. + Matches the October 28, 2023 release on GitHub. http://go.microsoft.com/fwlink/?LinkId=248926 images\icon.jpg diff --git a/CMakeLists.txt b/CMakeLists.txt index 368e7be..0373374 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,9 +3,9 @@ cmake_minimum_required (VERSION 3.20) -set(DIRECTXTEX_VERSION 2.0.0) +set(DIRECTXTEX_VERSION 2.0.1) -if(DEFINED XBOX_CONSOLE_TARGET) +if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET)) set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY") endif() diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h index 2bc5cc4..50e591d 100644 --- a/DirectXTex/DirectXTex.h +++ b/DirectXTex/DirectXTex.h @@ -47,7 +47,7 @@ struct IWICImagingFactory; struct IWICMetadataQueryReader; #endif -#define DIRECTX_TEX_VERSION 200 +#define DIRECTX_TEX_VERSION 201 namespace DirectX diff --git a/HISTORY.md b/HISTORY.md index 5965fe9..6c60341 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -6,6 +6,15 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT ## Release History +### October 28, 2023 +* New ``DDS_PERMISSIVE_FLAG`` to allow reading of various DDS DX9 file variants + * *breaking change* required to accept reading *Unreal Tournament 2004* DDS files + * Allows cases where DDS_HEADER size is incorrectly set to 24 + * Allows cases where DDPIXELFORMAT size is incorrectly set to 24 + * Allows cases where DDS_HEADER.MipMapCount is set to the wrong value +* texassemble/texconv/texdiag: -flist option updated to support filenames with spaces +* texconv: -permissive switch added to opt-in use of new flag when reading DDS files + ### September 1, 2023 * ``CompressEx`` and ``ConvertEx`` functions added with status callback and options structs * Added optional ``DDSMetaData`` return for Ex versions of DDS loader functions diff --git a/README.md b/README.md index 1d180b9..5456108 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkId=248926 Copyright (c) Microsoft Corporation. -**September 1, 2023** +**October 28, 2023** This package contains DirectXTex, a shared source library for reading and writing ``.DDS`` files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes ``.TGA`` and ``.HDR`` readers and writers since these image file formats are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec. diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp index 6e7b2fc..bb19a87 100644 --- a/Texconv/texconv.cpp +++ b/Texconv/texconv.cpp @@ -946,6 +946,7 @@ namespace L" -t{u|f} TYPELESS format is treated as UNORM or FLOAT\n" L" -dword Use DWORD instead of BYTE alignment\n" L" -badtails Fix for older DXTn with bad mipchain tails\n" + L" -permissive Allow some DX9 variants with unusual header values\n" L" -fixbc4x4 Fix for odd-sized BC files that Direct3D can't load\n" L" -xlum expand legacy L8, L16, and A8P8 formats\n" L"\n"