From 9260384a375e0b39e7b22c8c67fd0d060f0c948a Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 28 Oct 2024 17:02:08 -0700 Subject: [PATCH] October 28, 2024 (#544) --- .nuget/directxtex_desktop_2019.nuspec | 2 +- .nuget/directxtex_desktop_win10.nuspec | 2 +- .nuget/directxtex_uwp.nuspec | 2 +- CHANGELOG.md | 10 ++++++++++ CMakeLists.txt | 2 +- DirectXTex/DirectXTex.h | 2 +- README.md | 23 ++++++++++++++++++++++- 7 files changed, 37 insertions(+), 6 deletions(-) diff --git a/.nuget/directxtex_desktop_2019.nuspec b/.nuget/directxtex_desktop_2019.nuspec index 23a28cb8..ceba6099 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 4, 2024 release on GitHub. + Matches the October 28, 2024 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 b173faa2..a29493a7 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 4, 2024 release on GitHub. + Matches the October 28, 2024 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 e974ff56..bfaa8ad6 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 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 4, 2024 release on GitHub. + Matches the October 28, 2024 release on GitHub. http://go.microsoft.com/fwlink/?LinkId=248926 images\icon.jpg diff --git a/CHANGELOG.md b/CHANGELOG.md index e860a7c9..39d02041 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,16 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT ## Release History +### October 28, 2024 +* All enums now use ``uint32_t`` as the underlying type rather than ``unsigned long`` or ``int``. +* Added ``BytesPerBlock`` utility helper +* Fixed bug in DirectX 12 `CaptureTexture` for MSAA resolve state handling +* texassemble, texconv, texdiag: + * Add "GNU-style" *--long-options* to the command-line tools (all existing switches are still supported) + * Fixed bug in texdiag's ``dumpdds`` command output filename extension handling + * Refactored code to use shared header +* CMake and MSBuild project updates + ### September 4, 2024 * DDS reader now accepts a variant of the "DX10" extended header * arraySize of 0 is treated as 1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6dc883a2..cffe5cae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.20) -set(DIRECTXTEX_VERSION 2.0.5) +set(DIRECTXTEX_VERSION 2.0.6) if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET)) set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY") diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h index 7efb0538..e24142cb 100644 --- a/DirectXTex/DirectXTex.h +++ b/DirectXTex/DirectXTex.h @@ -47,7 +47,7 @@ struct IWICImagingFactory; struct IWICMetadataQueryReader; #endif -#define DIRECTX_TEX_VERSION 205 +#define DIRECTX_TEX_VERSION 206 namespace DirectX diff --git a/README.md b/README.md index f3ecbb8a..a64ccb08 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkId=248926 Copyright (c) Microsoft Corporation. -**September 4, 2024** +**October 28, 2024** 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. @@ -104,6 +104,27 @@ For a full change history, see [CHANGELOG.md](https://github.com/microsoft/Direc * The ``CompileShaders.cmd`` script must have Windows-style (CRLF) line-endings. If it is changed to Linux-style (LF) line-endings, it can fail to build all the required shaders. +* As of the October 2024 release, the command-line tools also support GNU-style long options using ``--``. All existing switches continue to function, but some of the `-` options are now deprecated per this table: + +|texassemble||texconv||texdiag|| +|---|---|---|---|---|---| +|-tonemap|--tonemap|-badtails|--bad-tails|-badtails|--bad-tails| +|-bgcolor|--gif-bg-color|-fixbc4x4|--fix-bc-4x4|-ignoremips|--ignore-mips| +|-swizzle|--swizzle|-ignoremips|--ignore-mips|-permissive|--permissive| +|-stripmips|--strip-mips|-inverty|--invert-y|-targetx|--target-x||-targety|--target-y| +|||-keepcoverage|--keep-coverage||| +|||-permissive|--permissive||| +|||-reconstructz|--reconstruct-z||| +|||-rotatecolor|--rotate-color||| +|||-singleproc|--single-proc||| +|||-swizzle|--swizzle||| +|||-tgazeroalpha|--tga-zero-alpha||| +|||-timing|--timing||| +|||-tonemap|--tonemap||| +|||-wiclossless|--wic-lossless||| +|||-wicmulti|--wic-multiframe||| +|||-x2bias|--x2-bias||| + ## Support For questions, consider using [Stack Overflow](https://stackoverflow.com/questions/tagged/directxtk) with the *directxtk* tag, or the [DirectX Discord Server](https://discord.gg/directx) in the *dx12-developers* or *dx9-dx11-developers* channel.