Skip to content

Commit 5a83705

Browse files
authored
October 28, 2023 (#404)
1 parent d19b882 commit 5a83705

File tree

8 files changed

+17
-7
lines changed

8 files changed

+17
-7
lines changed

.nuget/directxtex_desktop_2019.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<description>This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022 and supports Windows 7 / DirectX 11.
1111

1212
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.</description>
13-
<releaseNotes>Matches the September 1, 2023 release on GitHub.</releaseNotes>
13+
<releaseNotes>Matches the October 28, 2023 release on GitHub.</releaseNotes>
1414
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248926</projectUrl>
1515
<repository type="git" url="https://github.com/microsoft/DirectXTex.git" />
1616
<icon>images\icon.jpg</icon>

.nuget/directxtex_desktop_win10.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<description>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.
1111

1212
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.</description>
13-
<releaseNotes>Matches the September 1, 2023 release on GitHub.</releaseNotes>
13+
<releaseNotes>Matches the October 28, 2023 release on GitHub.</releaseNotes>
1414
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248926</projectUrl>
1515
<repository type="git" url="https://github.com/microsoft/DirectXTex.git" />
1616
<icon>images\icon.jpg</icon>

.nuget/directxtex_uwp.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<description>This version is for Universal Windows Platform apps on Windows 10 / Windows 11 using Visual Studio 2019 (16.11) or Visual Studio 2022.
1111

1212
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.</description>
13-
<releaseNotes>Matches the September 1, 2023 release on GitHub.</releaseNotes>
13+
<releaseNotes>Matches the October 28, 2023 release on GitHub.</releaseNotes>
1414
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248926</projectUrl>
1515
<repository type="git" url="https://github.com/microsoft/DirectXTex.git" />
1616
<icon>images\icon.jpg</icon>

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
cmake_minimum_required (VERSION 3.20)
55

6-
set(DIRECTXTEX_VERSION 2.0.0)
6+
set(DIRECTXTEX_VERSION 2.0.1)
77

8-
if(DEFINED XBOX_CONSOLE_TARGET)
8+
if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
99
set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
1010
endif()
1111

DirectXTex/DirectXTex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ struct IWICImagingFactory;
4747
struct IWICMetadataQueryReader;
4848
#endif
4949

50-
#define DIRECTX_TEX_VERSION 200
50+
#define DIRECTX_TEX_VERSION 201
5151

5252

5353
namespace DirectX

HISTORY.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
66

77
## Release History
88

9+
### October 28, 2023
10+
* New ``DDS_PERMISSIVE_FLAG`` to allow reading of various DDS DX9 file variants
11+
* *breaking change* required to accept reading *Unreal Tournament 2004* DDS files
12+
* Allows cases where DDS_HEADER size is incorrectly set to 24
13+
* Allows cases where DDPIXELFORMAT size is incorrectly set to 24
14+
* Allows cases where DDS_HEADER.MipMapCount is set to the wrong value
15+
* texassemble/texconv/texdiag: -flist option updated to support filenames with spaces
16+
* texconv: -permissive switch added to opt-in use of new flag when reading DDS files
17+
918
### September 1, 2023
1019
* ``CompressEx`` and ``ConvertEx`` functions added with status callback and options structs
1120
* Added optional ``DDSMetaData`` return for Ex versions of DDS loader functions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkId=248926
66

77
Copyright (c) Microsoft Corporation.
88

9-
**September 1, 2023**
9+
**October 28, 2023**
1010

1111
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.
1212

Texconv/texconv.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -946,6 +946,7 @@ namespace
946946
L" -t{u|f} TYPELESS format is treated as UNORM or FLOAT\n"
947947
L" -dword Use DWORD instead of BYTE alignment\n"
948948
L" -badtails Fix for older DXTn with bad mipchain tails\n"
949+
L" -permissive Allow some DX9 variants with unusual header values\n"
949950
L" -fixbc4x4 Fix for odd-sized BC files that Direct3D can't load\n"
950951
L" -xlum expand legacy L8, L16, and A8P8 formats\n"
951952
L"\n"

0 commit comments

Comments
 (0)