Skip to content

Commit 7aae827

Browse files
authoredSep 5, 2024··
September 4, 2024 (#505)
1 parent 8193c66 commit 7aae827

12 files changed

+166
-6
lines changed
 

‎.github/workflows/wsl.yml

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030

3131
matrix:
3232
build_type: [x64-Debug-Linux, x64-Release-Linux]
33+
gcc: [10, 11, 12]
3334

3435
steps:
3536
- uses: actions/checkout@v4
@@ -49,6 +50,10 @@ jobs:
4950
-DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
5051
-DVCPKG_TARGET_TRIPLET="x64-linux"
5152
53+
env:
54+
CC: gcc-${{ matrix.gcc }}
55+
CXX: g++-${{ matrix.gcc }}
56+
5257
- name: 'Build'
5358
working-directory: ${{ github.workspace }}
5459
run: cmake --build out/build/${{ matrix.build_type }}

‎.nuget/directxtex_desktop_2019.nuspec

+1-1
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 June 4, 2024 release on GitHub.</releaseNotes>
13+
<releaseNotes>Matches the September 4, 2024 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

+1-1
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 June 4, 2024 release on GitHub.</releaseNotes>
13+
<releaseNotes>Matches the September 4, 2024 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

+1-1
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 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 June 4, 2024 release on GitHub.</releaseNotes>
13+
<releaseNotes>Matches the September 4, 2024 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>

‎CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
66

77
## Release History
88

9+
### September 4, 2024
10+
* DDS reader now accepts a variant of the "DX10" extended header
11+
* arraySize of 0 is treated as 1
12+
* DDS reader will now load legacy 'mixed' channel formats as UNORM
13+
* Uses x2bias for the signed channels
14+
* `DDSPF_L6V5U5`, `DDSPF_X8L8V8U8`, `DDSPF_A2W10V10U10`
15+
* texconv: Added `-ignoremips` option to handle some invalid/truncated DDS files
16+
* EXR auxiliary reader returns 6 images for files with 'envmap' metadata
17+
* PNG auxiliary reader/writer fixed for single channel images (`DXGI_FORMAT_R8_UNORM`)
18+
* Xbox auxiliary now has `EncodeDDSHeader` function
19+
* ScreenGrab9 minor DDS header fix when writing A2W10V10U10 legacy mixed formats
20+
* CMake project updates including support for ARM64EC
21+
* Added GitHub Actions YAML files
22+
923
### June 4, 2024
1024
* Fix for HDR codec to avoid buffer overread for some malformed files
1125
* Updated D3DX12 internal copy with latest changes from DirectX-Headers GitHub

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
cmake_minimum_required (VERSION 3.20)
55

6-
set(DIRECTXTEX_VERSION 2.0.4)
6+
set(DIRECTXTEX_VERSION 2.0.5)
77

88
if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
99
set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")

‎DirectXTex/DirectXTex.h

+1-1
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 204
50+
#define DIRECTX_TEX_VERSION 205
5151

5252

5353
namespace DirectX

‎README.md

+1-1
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-
**June 4, 2024**
9+
**September 4, 2024**
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

‎build/Directory.Build.props

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4+
<!--
5+
Copyright (c) Microsoft Corporation.
6+
Licensed under the MIT License.
7+
-->
8+
49
<PropertyGroup>
510
<ExtractedFolder Condition="'$(ExtractedFolder)'==''">C:\xtracted\</ExtractedFolder>
611
<ExtractedFolder Condition="!HasTrailingSlash('$(ExtractedFolder)')">$(ExtractedFolder)\</ExtractedFolder>

‎build/onefuzz-setup.ps1

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
<#
2+
Copyright (c) Microsoft Corporation.
3+
Licensed under the MIT License.
4+
#>
5+
16
function Execute-Setup {
27
# Temporary work-around while OneFuzz does not run script from setup dir
38
Set-Location -Path $PSScriptRoot

‎build/preparerelease.ps1

+126
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
<#
2+
3+
.NOTES
4+
Copyright (c) Microsoft Corporation.
5+
Licensed under the MIT License.
6+
7+
.SYNOPSIS
8+
Prepares a PR for release
9+
10+
.DESCRIPTION
11+
This script is used to do the edits required for preparing a release PR.
12+
13+
.PARAMETER BaseBranch
14+
This the branch to use as the base of the release. Defaults to 'main'.
15+
16+
.PARAMETER TargetBranch
17+
This is the name of the newly created branch for the release PR. Defaults to '<DATETAG>release'. If set to 'none', then no branch is created.
18+
19+
.PARAMETER UpdateVersion
20+
This is a $true or $false value that indicates if the library version number should be incremented. Defaults to $true.
21+
22+
.LINK
23+
https://github.com/microsoft/DirectXTex/wiki
24+
25+
#>
26+
27+
param(
28+
[string]$BaseBranch = "main",
29+
[string]$TargetBranch = $null,
30+
[bool]$UpdateVersion = $true
31+
)
32+
33+
$reporoot = Split-Path -Path $PSScriptRoot -Parent
34+
$cmake = $reporoot + "\CMakeLists.txt"
35+
$header = $reporoot + "\DirectXTex\DirectXTex.h"
36+
$readme = $reporoot + "\README.md"
37+
$history = $reporoot + "\CHANGELOG.md"
38+
39+
if ((-Not (Test-Path $cmake)) -Or (-Not (Test-Path $header)) -Or (-Not (Test-Path $readme)) -Or (-Not (Test-Path $history))) {
40+
Write-Error "ERROR: Unexpected location of script file!" -ErrorAction Stop
41+
}
42+
43+
$branch = git branch --show-current
44+
if ($branch -ne $BaseBranch) {
45+
Write-Error "ERROR: Must be in the $BaseBranch branch!" -ErrorAction Stop
46+
}
47+
48+
git pull -q
49+
if ($LastExitCode -ne 0) {
50+
Write-Error "ERROR: Failed to sync branch!" -ErrorAction Stop
51+
}
52+
53+
$version = Get-Content ($cmake) | Select-String -Pattern "set\(DIRECTXTEX_VERSION" -CaseSensitive
54+
if (-Not ($version -match "([0-9]?\.[0-9]?\.[0-9]?)")) {
55+
Write-Error "ERROR: Failed to current version!" -ErrorAction Stop
56+
}
57+
$version = $Matches.0
58+
$rawversion = $version.replace('.','')
59+
60+
$newreleasedate = Get-Date -Format "MMMM d, yyyy"
61+
$newreleasetag = (Get-Date -Format "MMMyyyy").ToLower()
62+
63+
if($UpdateVersion) {
64+
[string]$newrawversion = ([int]$rawversion + 1)
65+
}
66+
else {
67+
$newrawversion = $rawversion
68+
}
69+
70+
$newversion = $newrawversion[0] + "." + $newrawversion[1] + "." + $newrawversion[2]
71+
72+
$rawreleasedate = $(Get-Content $readme) | Select-String -Pattern "\*\*[A-Z][a-z]+\S.\d+,?\S.\d\d\d\d\*\*"
73+
if ([string]::IsNullOrEmpty($rawreleasedate)) {
74+
Write-Error "ERROR: Failed to current release date!" -ErrorAction Stop
75+
}
76+
$releasedate = $rawreleasedate -replace '\*',''
77+
78+
if($releasedate -eq $newreleasedate) {
79+
Write-Error ("ERROR: Release "+$releasedate+" already exists!") -ErrorAction Stop
80+
}
81+
82+
if ($TargetBranch -ne 'none') {
83+
if ([string]::IsNullOrEmpty($TargetBranch)) {
84+
$TargetBranch = $newreleasetag + "release"
85+
}
86+
87+
git checkout -b $TargetBranch
88+
if ($LastExitCode -ne 0) {
89+
Write-Error "ERROR: Failed to create new topic branch!" -ErrorAction Stop
90+
}
91+
}
92+
93+
Write-Host " Old Version: " $version
94+
Write-Host "Old Release Date: " $releasedate
95+
Write-Host "->"
96+
Write-Host " Release Date: " $newreleasedate
97+
Write-Host " Release Tag: " $newreleasetag
98+
Write-Host " Release Version: " $newversion
99+
100+
if($UpdateVersion) {
101+
(Get-Content $cmake).Replace("set(DIRECTXTEX_VERSION $version)","set(DIRECTXTEX_VERSION $newversion)") | Set-Content $cmake
102+
(Get-Content $header).Replace("#define DIRECTX_TEX_VERSION $rawversion","#define DIRECTX_TEX_VERSION $newrawversion") | Set-Content $header
103+
}
104+
105+
(Get-Content $readme).Replace("$rawreleasedate", "**$newreleasedate**") | Set-Content $readme
106+
107+
Get-ChildItem -Path ($reporoot + "\.nuget") -Filter *.nuspec | Foreach-Object {
108+
(Get-Content -Path $_.Fullname).Replace("$releasedate", "$newreleasedate") | Set-Content -Path $_.Fullname -Encoding utf8
109+
}
110+
111+
[System.Collections.ArrayList]$file = Get-Content $history
112+
$inserthere = @()
113+
114+
for ($i=0; $i -lt $file.count; $i++) {
115+
if ($file[$i] -match "## Release History") {
116+
$inserthere += $i + 1
117+
}
118+
}
119+
120+
$file.insert($inserthere[0], "`n### $newreleasedate`n* change history here")
121+
Set-Content -Path $history -Value $file
122+
123+
code $history $readme
124+
if ($LastExitCode -ne 0) {
125+
Write-Error "ERROR: Failed to launch VS Code!" -ErrorAction Stop
126+
}

‎build/versioninfo.ps1

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
<#
2+
Copyright (c) Microsoft Corporation.
3+
Licensed under the MIT License.
4+
#>
5+
16
param(
27
[string]$version
38
)

0 commit comments

Comments
 (0)
Please sign in to comment.