Bump github/codeql-action from 3.28.18 to 3.29.2 (#621)

Signed-off-by: StepSecurity Bot <bot@stepsecurity.io>

.azuredevops/pipelines/DirectXTex-GitHub-CMake-Dev17.yml

@@ -0,0 +1,370 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library using CMake with VS Generator (GitHub Actions covers Ninja).
+
+schedules:
+  - cron: "0 5 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+trigger:
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+      - '*.md'
+      - LICENSE
+      - '.github/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/OneFuzz*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+      - '*.md'
+      - LICENSE
+      - '.github/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/OneFuzz*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+  drafts: false
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+    - repository: vcpkgRepo
+      name: Microsoft/vcpkg
+      type: github
+      endpoint: microsoft
+      ref: refs/tags/$(VCPKG_TAG)
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: VCPKG_ROOT
+    value: '$(Build.SourcesDirectory)/vcpkg'
+  - name: VCPKG_CMAKE_DIR
+    value: '$(Build.SourcesDirectory)/vcpkg/scripts/buildsystems/vcpkg.cmake'
+  - name: VCPKG_MANIFEST_DIR
+    value: '$(Build.SourcesDirectory)/build'
+  - name: VS_GENERATOR
+    value: 'Visual Studio 17 2022'
+  - name: WIN10_SDK
+    value: '10.0.19041.0'
+  - name: WIN11_SDK
+    value: '10.0.22000.0'
+
+pool:
+  vmImage: windows-2022
+
+jobs:
+  - job: CMAKE_BUILD
+    displayName: CMake using VS Generator
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Release'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x86'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A Win32 -B out2
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x86 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out2 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x86 Release'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out2 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config ARM64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A ARM64 -B out3
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build ARM64 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out3 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build ARM64 Release'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out3 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (UWP): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out4
+            -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
+      - task: CMake@1
+        displayName: 'CMake (UWP): Build x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out4 -v
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out5
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build x64 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out5 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build x64 Release'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out5 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Config ARM64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A ARM64 -T clangcl -B out6
+            -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build ARM64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out6 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (Win10): Config'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out7
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=ON
+      - task: CMake@1
+        displayName: 'CMake (Win10): Build'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out7 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC Spectre): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out8
+            -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC Spectre): Build x64 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out8 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC Spectre): Build x64 Release'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out8 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (MSVC Spectre): Config ARM64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A ARM64 -B out9
+            -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC Spectre): Build ARM64 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out9 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC Spectre): Build ARM64 Release'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out9 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (Win10 Spectre): Config'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out10
+            -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=ON
+      - task: CMake@1
+        displayName: 'CMake (Win10 Spectre): Build'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out10 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (NO_WCHAR_T): Config'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out11
+            -DNO_WCHAR_T=ON
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
+            -DBUILD_DX12=ON
+      - task: CMake@1
+        displayName: 'CMake (NO_WCHAR_T): Build'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out11 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (DLL): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out12
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=ON
+            -DBUILD_SHARED_LIBS=ON
+      - task: CMake@1
+        displayName: 'CMake (DLL): Build x64 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out12 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (DLL): Build x64 Release'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out12 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (UWP DLL): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out13
+            -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
+            -DBUILD_SHARED_LIBS=ON
+      - task: CMake@1
+        displayName: 'CMake (UWP DLL): Build x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out13 -v
+
+  - job: CMAKE_BUILD_VCPKG
+    displayName: CMake using VCPKG
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: vcpkgRepo
+        displayName: Fetch VCPKG
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/vcpkg'
+      - task: CmdLine@2
+        displayName: VCPKG Bootstrap
+        inputs:
+          script: call bootstrap-vcpkg.bat
+          workingDirectory: $(VCPKG_ROOT)
+      - task: CmdLine@2
+        displayName: VCPKG install packages
+        inputs:
+          script: call vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=x64-windows
+          workingDirectory: $(VCPKG_ROOT)
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64 w/ OpenEXR'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out2 -DENABLE_OPENEXR_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug w/ OpenEXR'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out2 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64 w/ libjpeg'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out3 -DENABLE_LIBJPEG_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug w/ libjpeg'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out3 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64 w/ libpng'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out4 -DENABLE_LIBPNG_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug w/ libpng'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out4 -v --config Debug

.azuredevops/pipelines/DirectXTex-GitHub-CMake-Xbox-Dev17.yml

@@ -0,0 +1,397 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library with Xbox extensions using CMake.
+
+schedules:
+  - cron: "0 4 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+trigger: none
+
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    include:
+      - '.azuredevops/pipelines/DirectXTex-GitHub-CMake-Xbox-Dev17.yml'
+      - CMake*
+      - build/*.cmake
+      - build/*.in
+      - DirectXTex/Shaders/CompileShaders.cmd
+      - Auxiliary/*Xbox*
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+      trigger: none
+    - repository: testRepo
+      name: walbourn/directxtextest
+      type: github
+      endpoint: microsoft
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: VS_GENERATOR
+    value: 'Visual Studio 17 2022'
+  - name: WIN10_SDK
+    value: '10.0.19041.0'
+  - name: EXTRACTED_FOLDER
+    value: '$(ExtractedFolder)'
+  - name: URL_FEED
+    value: $(ADOFeedURL)
+  - name: VC_PATH
+    value: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
+  - name: GameDKLatest
+    value: '$(ExtractedFolder)\Microsoft.gdk.xbox.$(GDK_EDITION)\native\$(GDK_EDITION)\'
+  - name: skipNugetSecurityAnalysis
+    value: true # We explicitly call this task so we don't need it to be auto-injected
+
+pool:
+  vmImage: windows-2022
+
+jobs:
+  - job: CMAKE_BUILD
+    displayName: CMake using VS Generator
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        # We have to use a nuget.config to provide the feed for the 'nuget install' option.
+        displayName: 'NuGet set package source to ADO feed'
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - task: NuGetCommand@2
+        displayName: NuGet install PGDK
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet install GDKX
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Release (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Config x64 (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build x64 Debug (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out2 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build x64 Release (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out2 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64 (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out3
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out3 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Release (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out3 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Config x64 (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build x64 Debug (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out4 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build x64 Release (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out4 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (DLL): Config x64 (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out5
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
+            -DBUILD_SHARED_LIBS=ON
+      - task: CMake@1
+        displayName: 'CMake (DLL): Build x64 Debug (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out5 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (DLL): Config x64 (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out6
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
+            -DBUILD_SHARED_LIBS=ON
+      - task: CMake@1
+        displayName: 'CMake (DLL): Build x64 Debug (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out6 -v --config Debug
+
+  - job: BUILD_GDK_CMAKE_XS
+    displayName: 'Xbox Series X|S Extensions BUILD_TESTING=ON'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: testRepo
+        displayName: Fetch Tests
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/Tests'
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        # We have to use a nuget.config to provide the feed for the 'nuget install' option.
+        displayName: 'NuGet set package source to ADO feed'
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - task: NuGetCommand@2
+        displayName: NuGet install PGDK
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet install GDKX
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: CmdLine@2
+        displayName: Setup BWOI for GDK command-line
+        inputs:
+          script: |
+            call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
+            echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
+            echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
+            echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
+            echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
+            echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
+            echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
+            call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) Scarlett
+            echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
+            echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
+            echo ##vso[task.setvariable variable=GXDKLatest;]%GXDKLatest%
+            echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
+            echo ##vso[task.setvariable variable=LIB;]%LIB%
+            echo ##vso[task.prependpath]%ADDBIN%
+
+          failOnStderr: true
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug-GDKX-S
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Debug-GDKX-S
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Release-GDKX-S
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Release-GDKX-S
+
+  - job: BUILD_GDK_CMAKE_X
+    displayName: 'Xbox One Extensions BUILD_TESTING=ON'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: testRepo
+        displayName: Fetch Tests
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/Tests'
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        # We have to use a nuget.config to provide the feed for the 'nuget install' option.
+        displayName: 'NuGet set package source to ADO feed'
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - task: NuGetCommand@2
+        displayName: NuGet install PGDK
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet install GDKX
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: CmdLine@2
+        displayName: Setup BWOI for GDK command-line
+        inputs:
+          script: |
+            call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
+            echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
+            echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
+            echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
+            echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
+            echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
+            echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
+            call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) XboxOne
+            echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
+            echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
+            echo ##vso[task.setvariable variable=GXDKLatest;]%GXDKLatest%
+            echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
+            echo ##vso[task.setvariable variable=LIB;]%LIB%
+            echo ##vso[task.prependpath]%ADDBIN%
+
+          failOnStderr: true
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug-GDKX
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Debug-GDKX
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Release-GDKX
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Release-GDKX

.azuredevops/pipelines/DirectXTex-GitHub-CMake-Xbox.yml

@@ -0,0 +1,229 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library with Xbox extensions using CMake.
+
+schedules:
+  - cron: "0 4 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+trigger:
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+      - '*.md'
+      - LICENSE
+      - '.github/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+      - '*.md'
+      - LICENSE
+      - '.github/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+  drafts: false
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: VS_GENERATOR
+    value: 'Visual Studio 16 2019'
+  - name: WIN10_SDK
+    value: '10.0.19041.0'
+  - name: EXTRACTED_FOLDER
+    value: '$(ExtractedFolder)'
+  - name: URL_FEED
+    value: $(ADOFeedURL)
+  - name: GameDKLatest
+    value: '$(ExtractedFolder)\Microsoft.gdk.xbox.$(GDK_EDITION)\native\$(GDK_EDITION)\'
+  - name: skipNugetSecurityAnalysis
+    value: true # We explicitly call this task so we don't need it to be auto-injected
+
+pool:
+  vmImage: windows-2019
+
+jobs:
+  - job: CMAKE_BUILD
+    displayName: CMake using VS Generator
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        # We have to use a nuget.config to provide the feed for the 'nuget install' option.
+        displayName: 'NuGet set package source to ADO feed'
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - task: NuGetCommand@2
+        displayName: NuGet install PGDK
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet install GDKX
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Release (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Config x64 (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build x64 Debug (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out2 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build x64 Release (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out2 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64 (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out3
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out3 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Release (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out3 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Config x64 (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build x64 Debug (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out4 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build x64 Release (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out4 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (DLL): Config x64 (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out5
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
+            -DBUILD_SHARED_LIBS=ON
+      - task: CMake@1
+        displayName: 'CMake (DLL): Build x64 Debug (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out5 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (DLL): Build x64 Release (Xbox Series X|S)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out5 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (DLL): Config x64 (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out6
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
+            -DBUILD_SHARED_LIBS=ON
+      - task: CMake@1
+        displayName: 'CMake (DLL): Build x64 Debug (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out6 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (DLL): Build x64 Release (Xbox One)'
+        inputs:
+          cwd: ''
+          cmakeArgs: --build out6 -v --config RelWithDebInfo

.azuredevops/pipelines/DirectXTex-GitHub-CMake.yml

@@ -0,0 +1,321 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library using CMake with VS Generator (GitHub Actions covers Ninja).
+
+schedules:
+  - cron: "0 5 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+trigger:
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+      - '*.md'
+      - LICENSE
+      - '.github/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/OneFuzz*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+      - '*.md'
+      - LICENSE
+      - '.github/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/OneFuzz*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+  drafts: false
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+    - repository: vcpkgRepo
+      name: Microsoft/vcpkg
+      type: github
+      endpoint: microsoft
+      ref: refs/tags/$(VCPKG_TAG)
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: VCPKG_ROOT
+    value: '$(Build.SourcesDirectory)/vcpkg'
+  - name: VCPKG_CMAKE_DIR
+    value: '$(Build.SourcesDirectory)/vcpkg/scripts/buildsystems/vcpkg.cmake'
+  - name: VCPKG_MANIFEST_DIR
+    value: '$(Build.SourcesDirectory)/build'
+  - name: VS_GENERATOR
+    value: 'Visual Studio 16 2019'
+  - name: WIN10_SDK
+    value: '10.0.19041.0'
+  - name: WIN11_SDK
+    value: '10.0.22000.0'
+
+pool:
+  vmImage: windows-2019
+
+jobs:
+  - job: CMAKE_BUILD
+    displayName: CMake using VS Generator
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Release'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x86'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A Win32 -B out2
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x86 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out2 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x86 Release'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out2 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (UWP): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out3
+            -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
+      - task: CMake@1
+        displayName: 'CMake (UWP): Build x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out3 -v
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build x64 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out4 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (ClangCl): Build x64 Release'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out4 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (Win10): Config'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out5
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=ON
+      - task: CMake@1
+        displayName: 'CMake (Win10): Build'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out5 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC Spectre): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out6
+            -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC Spectre): Build x64 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out6 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC Spectre): Build x64 Release'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out6 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (Win10 Spectre): Config'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out7
+            -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=ON
+      - task: CMake@1
+        displayName: 'CMake (Win10 Spectre): Build'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out7 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (NO_WCHAR_T): Config'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out8
+            -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+            -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
+            -DBUILD_DX12=ON
+      - task: CMake@1
+        displayName: 'CMake (NO_WCHAR_T): Build'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out8 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (DLL): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out9
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DBUILD_DX12=ON
+            -DBUILD_SHARED_LIBS=ON
+      - task: CMake@1
+        displayName: 'CMake (DLL): Build x64 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out9 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (DLL): Build x64 Release'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out9 -v --config RelWithDebInfo
+      - task: CMake@1
+        displayName: 'CMake (UWP DLL): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out10
+            -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
+            -DBUILD_SHARED_LIBS=ON
+      - task: CMake@1
+        displayName: 'CMake (UWP DLL): Build x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out10 -v
+
+  - job: CMAKE_BUILD_VCPKG
+    displayName: CMake using VCPKG
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: vcpkgRepo
+        displayName: Fetch VCPKG
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/vcpkg'
+      - task: CmdLine@2
+        displayName: VCPKG Bootstrap
+        inputs:
+          script: call bootstrap-vcpkg.bat
+          workingDirectory: $(VCPKG_ROOT)
+      - task: CmdLine@2
+        displayName: VCPKG install packages
+        inputs:
+          script: call vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=x64-windows
+          workingDirectory: $(VCPKG_ROOT)
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64 w/ OpenEXR'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out2 -DENABLE_OPENEXR_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug w/ OpenEXR'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out2 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64 w/ libjpeg'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out3 -DENABLE_LIBJPEG_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug w/ libjpeg'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out3 -v --config Debug
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64 w/ libpng'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out4 -DENABLE_LIBPNG_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Debug w/ libpng'
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out4 -v --config Debug

.azuredevops/pipelines/DirectXTex-GitHub-Dev17.yml

@@ -0,0 +1,154 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library for Windows Desktop and UWP.
+
+schedules:
+  - cron: "0 3 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+# GitHub Actions handles MSBuild for CI/PR
+trigger: none
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    include:
+      - '.azuredevops/pipelines/DirectXTex-GitHub-Dev17.yml'
+      - DirectXTex/Shaders/CompileShaders.cmd
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+variables:
+  Codeql.Enabled: false
+
+pool:
+  vmImage: windows-2022
+
+jobs:
+  - job: DESKTOP_BUILD
+    displayName: 'Windows Desktop'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    strategy:
+      maxParallel: 3
+      matrix:
+        Release_arm64:
+          BuildPlatform: ARM64
+          BuildConfiguration: Release
+          SpectreMitigation: false
+        Debug_arm64:
+          BuildPlatform: ARM64
+          BuildConfiguration: Debug
+          SpectreMitigation: false
+        Release_x64:
+          BuildPlatform: x64
+          BuildConfiguration: Release
+          SpectreMitigation: false
+        Debug_x64:
+          BuildPlatform: x64
+          BuildConfiguration: Debug
+          SpectreMitigation: false
+        Release_x86:
+          BuildPlatform: x86
+          BuildConfiguration: Release
+          SpectreMitigation: false
+        Debug_x86:
+          BuildPlatform: x86
+          BuildConfiguration: Debug
+          SpectreMitigation: false
+        Release_arm64_SpectreMitigated:
+          BuildPlatform: ARM64
+          BuildConfiguration: Release
+          SpectreMitigation: 'Spectre'
+        Debug_arm64_SpectreMitigated:
+          BuildPlatform: ARM64
+          BuildConfiguration: Debug
+          SpectreMitigation: 'Spectre'
+        Release_x64_SpectreMitigated:
+          BuildPlatform: x64
+          BuildConfiguration: Release
+          SpectreMitigation: 'Spectre'
+        Debug_x64_SpectreMitigated:
+          BuildPlatform: x64
+          BuildConfiguration: Debug
+          SpectreMitigation: 'Spectre'
+        Release_x86_SpectreMitigated:
+          BuildPlatform: x86
+          BuildConfiguration: Release
+          SpectreMitigation: 'Spectre'
+        Debug_x86_SpectreMitigated:
+          BuildPlatform: x86
+          BuildConfiguration: Debug
+          SpectreMitigation: 'Spectre'
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Desktop_2022.sln
+        inputs:
+          solution: DirectXTex_Desktop_2022.sln
+          msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=$(SpectreMitigation)
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+          msbuildArchitecture: x64
+        condition: ne(variables['BuildPlatform'], 'ARM64')
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Desktop_2022_Win10.sln
+        inputs:
+          solution: DirectXTex_Desktop_2022_Win10.sln
+          msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=$(SpectreMitigation)
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+          msbuildArchitecture: x64
+
+  - job: UWP_BUILD
+    displayName: 'Universal Windows Platform (UWP)'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    strategy:
+      maxParallel: 3
+      matrix:
+        Release_arm64:
+          BuildPlatform: ARM64
+          BuildConfiguration: Release
+        Debug_arm64:
+          BuildPlatform: ARM64
+          BuildConfiguration: Debug
+        Release_x64:
+          BuildPlatform: x64
+          BuildConfiguration: Release
+        Debug_x64:
+          BuildPlatform: x64
+          BuildConfiguration: Debug
+        Release_x86:
+          BuildPlatform: x86
+          BuildConfiguration: Release
+        Debug_x86:
+          BuildPlatform: x86
+          BuildConfiguration: Debug
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Windows10_2022.sln
+        inputs:
+          solution: DirectXTex_Windows10_2022.sln
+          msbuildArgs: /p:PreferredToolArchitecture=x64
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+          msbuildArchitecture: x64

.azuredevops/pipelines/DirectXTex-GitHub-GDK-Dev17.yml

@@ -0,0 +1,359 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library using the Microsoft GDK.
+
+schedules:
+  - cron: "30 3 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+trigger: none
+
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    include:
+      - '.azuredevops/pipelines/DirectXTex-GitHub-GDK-Dev17.yml'
+      - '.azuredevops/templates/DirectXTex-build-gdk.yml'
+      - CMakeList.txt
+      - build/*.in
+      - build/*.cmake
+      - build/SetupBWOI.*
+      - DirectXTex/Shaders/CompileShaders.cmd
+      - Auxiliary/*Xbox*
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+      trigger: none
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+pool:
+  vmImage: windows-2022
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: EXTRACTED_FOLDER
+    value: '$(ExtractedFolder)'
+  - name: GDKEnableBWOI
+    value: true
+  - name: URL_FEED
+    value: $(ADOFeedURL)
+  - name: VC_PATH
+    value: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
+  - name: skipNugetSecurityAnalysis
+    value: true # We explicitly call this task so we don't need it to be auto-injected
+
+jobs:
+  - job: BUILD_GDK
+    displayName: 'Microsoft Game Development Kit (GDK)'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        # We have to use a nuget.config to provide the feed for the 'nuget install' option.
+        displayName: 'NuGet set package source to ADO feed'
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - task: NuGetCommand@2
+        displayName: NuGet install PGDK
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet install GDKX
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: CopyFiles@2
+        displayName: Set up Directory.Build.props
+        inputs:
+          SourceFolder: build
+          Contents: 'Directory.Build.props'
+          TargetFolder: $(Build.SourcesDirectory)
+      - task: MSBuild@1
+        displayName: Setup BWOI VCTargets
+        inputs:
+          solution: build/SetupBWOI.targets
+          msbuildVersion: 17.0
+          msbuildArchitecture: x64
+          msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
+      - template: '/.azuredevops/templates/DirectXTex-build-gdk.yml'
+        parameters:
+          msVersion: '17.0'
+          vsYear: 2022
+
+  - job: BUILD_GDK_CMAKE_SCAR
+    displayName: 'Microsoft Game Development Kit (GDK) using CMake (Scarlett)'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        # We have to use a nuget.config to provide the feed for the 'nuget install' option.
+        displayName: 'NuGet set package source to ADO feed'
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - task: NuGetCommand@2
+        displayName: NuGet install PGDK
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet install GDKX
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: CmdLine@2
+        displayName: Setup BWOI for GDK command-line
+        inputs:
+          script: |
+            call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
+            echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
+            echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
+            echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
+            echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
+            echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
+            echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
+            call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) Scarlett
+            echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
+            echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
+            echo ##vso[task.setvariable variable=GXDKLatest;]%GXDKLatest%
+            echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
+            echo ##vso[task.setvariable variable=LIB;]%LIB%
+            echo ##vso[task.prependpath]%ADDBIN%
+
+          failOnStderr: true
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config Scarlett Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug-Scarlett
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build Scarlett Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Debug-Scarlett
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config Scarlett Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Release-Scarlett
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build Scarlett Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Release-Scarlett
+      - task: CMake@1
+        displayName: 'CMake (Clang): Config Scarlett Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug-Scarlett-Clang
+      - task: CMake@1
+        displayName: 'CMake (Clang): Build Scarlett Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Debug-Scarlett-Clang
+      - task: CMake@1
+        displayName: 'CMake (Clang): Config Scarlett Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Release-Scarlett-Clang
+      - task: CMake@1
+        displayName: 'CMake (Clang): Build Scarlett Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Release-Scarlett-Clang
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out/build'
+      - task: CMake@1
+        displayName: 'CMake (DLL): Config Scarlett Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug-Scarlett -DBUILD_SHARED_LIBS=ON
+      - task: CMake@1
+        displayName: 'CMake (DLL): Build Scarlett Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Debug-Scarlett
+
+  - job: BUILD_GDK_CMAKE_XBONE
+    displayName: 'Microsoft Game Development Kit (GDK) using CMake (XboxOne)'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        # We have to use a nuget.config to provide the feed for the 'nuget install' option.
+        displayName: 'NuGet set package source to ADO feed'
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - task: NuGetCommand@2
+        displayName: NuGet install PGDK
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet install GDKX
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: CmdLine@2
+        displayName: Setup BWOI for GDK command-line
+        inputs:
+          script: |
+            call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
+            echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
+            echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
+            echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
+            echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
+            echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
+            echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
+            call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) XboxOne
+            echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
+            echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
+            echo ##vso[task.setvariable variable=GXDKLatest;]%GXDKLatest%
+            echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
+            echo ##vso[task.setvariable variable=LIB;]%LIB%
+            echo ##vso[task.prependpath]%ADDBIN%
+
+          failOnStderr: true
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config XboxOne Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug-XboxOne
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build XboxOne Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Debug-XboxOne
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config XboxOne Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Release-XboxOne
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build XboxOne Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Release-XboxOne
+      - task: CMake@1
+        displayName: 'CMake (Clang): Config XboxOne Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug-XboxOne-Clang
+      - task: CMake@1
+        displayName: 'CMake (Clang): Build XboxOne Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Debug-XboxOne-Clang
+      - task: CMake@1
+        displayName: 'CMake (Clang): Config XboxOne Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Release-XboxOne-Clang
+      - task: CMake@1
+        displayName: 'CMake (Clang): Build XboxOne Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Release-XboxOne-Clang
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out/build'
+      - task: CMake@1
+        displayName: 'CMake (DLL): Config XboxOne Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug-XboxOne -DBUILD_SHARED_LIBS=ON
+      - task: CMake@1
+        displayName: 'CMake (DLL): Build XboxOne Debug'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out\build\x64-Debug-XboxOne

.azuredevops/pipelines/DirectXTex-GitHub-GDK.yml

@@ -0,0 +1,138 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library using the Microsoft GDK.
+
+# NOTE: We use x64 MSBuild for the GDK as the NuGets don't include 32-bit support to avoid cross-arch dependencies.
+
+schedules:
+  - cron: "30 3 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+trigger:
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+      - '*.md'
+      - LICENSE
+      - CMake*
+      - '.github/**'
+      - '.nuget/*'
+      - build/*.cmake
+      - build/*.cmd
+      - build/*.in
+      - build/*.json
+      - build/*.ps1
+
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+      - '*.md'
+      - LICENSE
+      - CMake*
+      - '.github/**'
+      - '.nuget/*'
+      - build/*.cmake
+      - build/*.cmd
+      - build/*.in
+      - build/*.json
+      - build/*.ps1
+  drafts: false
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+pool:
+  vmImage: windows-2019
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: EXTRACTED_FOLDER
+    value: '$(ExtractedFolder)'
+  - name: GDKEnableBWOI
+    value: true
+  - name: URL_FEED
+    value: $(ADOFeedURL)
+  - name: skipNugetSecurityAnalysis
+    value: true # We explicitly call this task so we don't need it to be auto-injected
+
+jobs:
+  - job: BUILD_GDK
+    displayName: 'Microsoft Game Development Kit (GDK)'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        # We have to use a nuget.config to provide the feed for the 'nuget install' option.
+        displayName: 'NuGet set package source to ADO feed'
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - task: NuGetCommand@2
+        displayName: NuGet install PGDK
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet install GDKX
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: CopyFiles@2
+        displayName: Set up Directory.Build.props
+        inputs:
+          SourceFolder: build
+          Contents: 'Directory.Build.props'
+          TargetFolder: $(Build.SourcesDirectory)
+      - task: MSBuild@1
+        displayName: Setup BWOI VCTargets
+        inputs:
+          solution: build/SetupBWOI.targets
+          msbuildVersion: 16.0
+          msbuildArchitecture: x64
+          msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
+      - template: '/.azuredevops/templates/DirectXTex-build-gdk.yml'
+        parameters:
+          msVersion: '16.0'
+          vsYear: 2019

.azuredevops/pipelines/DirectXTex-GitHub-MinGW.yml

@@ -0,0 +1,354 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library and test suite using the MinGW compiler.
+
+schedules:
+  - cron: "0 5 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+trigger:
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+      - '*.md'
+      - LICENSE
+      - '.github/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/OneFuzz*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+      - '*.md'
+      - LICENSE
+      - '.github/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/OneFuzz*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+  drafts: false
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+    - repository: vcpkgRepo
+      name: Microsoft/vcpkg
+      type: github
+      endpoint: microsoft
+      ref: refs/tags/$(VCPKG_TAG)
+    - repository: testRepo
+      name: walbourn/directxtextest
+      type: github
+      endpoint: microsoft
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+pool:
+  vmImage: windows-2022
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: VCPKG_ROOT
+    value: '$(Build.SourcesDirectory)/vcpkg'
+  - name: VCPKG_CMAKE_DIR
+    value: '$(Build.SourcesDirectory)/vcpkg/scripts/buildsystems/vcpkg.cmake'
+  - name: VCPKG_MANIFEST_DIR
+    value: '$(Build.SourcesDirectory)/build'
+  - name: WIN11_SDK
+    value: '10.0.22000.0'
+  - name: BASE_URL
+    value: https://github.com/brechtsanders/winlibs_mingw/releases/download
+  - name: URL_MINGW32
+    value: $(BASE_URL)/12.2.0-14.0.6-10.0.0-ucrt-r2/winlibs-i686-posix-dwarf-gcc-12.2.0-llvm-14.0.6-mingw-w64ucrt-10.0.0-r2.zip
+  - name: HASH_MINGW32
+    value: 'fcd1e11b896190da01c83d5b5fb0d37b7c61585e53446c2dab0009debc3915e757213882c35e35396329338de6f0222ba012e23a5af86932db45186a225d1272'
+  - name: CompileShadersOutput
+    value: '$(Build.BinariesDirectory)\Shaders'
+
+jobs:
+  - job: MINGW32_BUILD
+    displayName: 'Minimalist GNU for Windows (MinGW32)'
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: vcpkgRepo
+        displayName: Fetch VCPKG
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/vcpkg'
+      - task: CmdLine@2
+        displayName: VCPKG Bootstrap
+        inputs:
+          script: |
+            call bootstrap-vcpkg.bat
+            echo ##vso[task.setvariable variable=VCPKG_DEFAULT_TRIPLET;]x86-mingw-static
+            echo ##vso[task.setvariable variable=VCPKG_DEFAULT_HOST_TRIPLET;]x86-mingw-static
+
+          workingDirectory: $(Build.SourcesDirectory)\vcpkg
+      - task: PowerShell@2
+        displayName: Install MinGW32 and setup for Windows 11 SDK
+        inputs:
+          targetType: inline
+          script: |
+            $ProgressPreference = 'SilentlyContinue'
+            Write-Host "Downloading winlibs..."
+            Invoke-WebRequest -Uri "$(URL_MINGW32)" -OutFile "gw32.zip"
+            Write-Host "Downloaded."
+            $fileHash = Get-FileHash -Algorithm SHA512 gw32.zip | ForEach { $_.Hash} | Out-String
+            $filehash = $fileHash.Trim()
+            Write-Host "##[debug]SHA512: " $fileHash
+            if ($fileHash -ne '$(HASH_MINGW32)') {
+                Write-Error -Message "##[error]Computed hash does not match!" -ErrorAction Stop
+            }
+            Write-Host "Extracting winlibs..."
+            Expand-Archive -LiteralPath 'gw32.zip'
+            Write-Host "Extracted."
+            Write-Host "Added to path: $env:BUILD_SOURCESDIRECTORY\gw32\mingw32\bin"
+            Write-Host "##vso[task.prependpath]$env:BUILD_SOURCESDIRECTORY\gw32\mingw32\bin"
+            $sdkroot = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows Kits\Installed Roots' | Select-Object -ExpandProperty KitsRoot10
+            $wsdkbin = "{0}bin\" -f $sdkroot
+            $wsdkverbin = "{0}bin\$(WIN11_SDK)\" -f $sdkroot
+            $wsdkarchbin = "{0}bin\$(WIN11_SDK)\x86" -f $sdkroot
+            if (Test-Path "$wsdkarchbin") {
+                Write-Host "##vso[task.setvariable variable=WindowsSdkBinPath;]$wsdkbin"
+                Write-Host "##vso[task.setvariable variable=WindowsSdkVerBinPath;]$wsdkverbin"
+                Write-Host "##vso[task.prependpath]$wsdkarchbin"
+            }
+            else {
+                Write-Error -Message "##[error]Can't find Windows SDK ($(WIN11_SDK))" -ErrorAction Stop
+            }
+
+          workingDirectory: $(Build.SourcesDirectory)
+      - task: CmdLine@2
+        displayName: GCC version
+        inputs:
+          script: g++ --version
+      - task: BatchScript@1
+        displayName: CompileShaders
+        inputs:
+          filename: DirectXTex/Shaders/CompileShaders.cmd
+          workingFolder: $(Build.SourcesDirectory)\DirectXTex\Shaders
+      - task: BatchScript@1
+        displayName: HLSL
+        inputs:
+          filename: DDSView/hlsl.cmd
+          workingFolder: $(Build.SourcesDirectory)\DDSView
+      - task: CmdLine@2
+        displayName: VCPKG install packages
+        inputs:
+          script: call vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=x86-mingw-static
+          workingDirectory: $(VCPKG_ROOT)
+      - task: CMake@1
+        displayName: CMake (MinGW32)
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x86
+            -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
+            -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
+      - task: CMake@1
+        displayName: CMake (MinGW32) Build
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out
+      - task: CMake@1
+        displayName: CMake (MinGW32) w/ OpenEXR
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out2 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_OPENEXR_SUPPORT=ON -DDIRECTX_ARCH=x86
+            -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
+            -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
+      - task: CMake@1
+        displayName: CMake (MinGW32) Build  w/ OpenEXR
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out2
+      - task: CMake@1
+        displayName: CMake (MinGW32) w/ libjpeg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out3 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBJPEG_SUPPORT=ON -DDIRECTX_ARCH=x86
+            -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
+            -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
+      - task: CMake@1
+        displayName: CMake (MinGW32) Build w/ libjpeg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out3
+      - task: CMake@1
+        displayName: CMake (MinGW32) w/ libpng
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out4 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBPNG_SUPPORT=ON -DDIRECTX_ARCH=x86
+            -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
+            -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
+      - task: CMake@1
+        displayName: CMake (MinGW32) Build w/ libpng
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out4
+
+  - job: MINGW64_BUILD
+    displayName: 'Minimalist GNU for Windows (MinGW-W64) BUILD_TESTING=ON'
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: vcpkgRepo
+        displayName: Fetch VCPKG
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/vcpkg'
+      - checkout: testRepo
+        displayName: Fetch Tests
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/Tests'
+      - task: CmdLine@2
+        displayName: VCPKG Bootstrap
+        inputs:
+          script: |
+            call bootstrap-vcpkg.bat
+            echo ##vso[task.setvariable variable=VCPKG_DEFAULT_TRIPLET;]x64-mingw-static
+            echo ##vso[task.setvariable variable=VCPKG_DEFAULT_HOST_TRIPLET;]x64-mingw-static
+
+          workingDirectory: $(Build.SourcesDirectory)\vcpkg
+      - task: PowerShell@2
+        displayName: Setup for Shader Compilation
+        inputs:
+          targetType: inline
+          script: |
+            $ProgressPreference = 'SilentlyContinue'
+            $sdkroot = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows Kits\Installed Roots' | Select-Object -ExpandProperty KitsRoot10
+            $wsdkbin = "{0}bin\" -f $sdkroot
+            $wsdkverbin = "{0}bin\$(WIN11_SDK)\" -f $sdkroot
+            $wsdkarchbin = "{0}bin\$(WIN11_SDK)\x64" -f $sdkroot
+            if (Test-Path "$wsdkarchbin") {
+                Write-Host "##vso[task.setvariable variable=WindowsSdkBinPath;]$wsdkbin"
+                Write-Host "##vso[task.setvariable variable=WindowsSdkVerBinPath;]$wsdkverbin"
+                Write-Host "##vso[task.prependpath]$wsdkarchbin"
+            }
+            else {
+                Write-Error -Message "##[error]Can't find Windows SDK ($(WIN11_SDK))" -ErrorAction Stop
+            }
+
+      - task: CmdLine@2
+        displayName: GCC version
+        inputs:
+          script: g++ --version
+      - task: BatchScript@1
+        displayName: CompileShaders.cmd
+        inputs:
+          filename: DirectXTex/Shaders/CompileShaders.cmd
+          workingFolder: $(Build.SourcesDirectory)\DirectXTex\Shaders
+      - task: BatchScript@1
+        displayName: HLSL
+        inputs:
+          filename: DDSView/hlsl.cmd
+          workingFolder: $(Build.SourcesDirectory)\DDSView
+      - task: CmdLine@2
+        displayName: VCPKG install packages
+        inputs:
+          script: call vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=x64-mingw-static
+          workingDirectory: $(VCPKG_ROOT)
+      - task: CMake@1
+        displayName: CMake (MinGW-W64)
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64
+            -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
+            -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
+      - task: CMake@1
+        displayName: CMake (MinGW-W64) Build
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out
+      - task: CMake@1
+        displayName: CMake (MinGW-W64) w/ OpenEXR
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out2 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_OPENEXR_SUPPORT=ON -DDIRECTX_ARCH=x64 -DBUILD_TESTING=OFF
+            -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
+            -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
+      - task: CMake@1
+        displayName: CMake (MinGW-W64) Build  w/ OpenEXR
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out2
+      - task: CMake@1
+        displayName: CMake (MinGW-W64) w/ libjpeg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out3 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBJPEG_SUPPORT=ON -DDIRECTX_ARCH=x64 -DBUILD_TESTING=OFF
+            -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
+            -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
+      - task: CMake@1
+        displayName: CMake (MinGW-W64) Build w/ libjpeg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out3
+      - task: CMake@1
+        displayName: CMake (MinGW-W64) w/ libpng
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out4 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBPNG_SUPPORT=ON -DDIRECTX_ARCH=x64 -DBUILD_TESTING=OFF
+            -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
+            -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
+      - task: CMake@1
+        displayName: CMake (MinGW-W64) Build w/ libpng
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out4

.azuredevops/pipelines/DirectXTex-GitHub-SDK-prerelease.yml

@@ -0,0 +1,157 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library using the latest prerelease of the Windows SDK from nuget.org.
+
+schedules:
+  - cron: "0 3 * * 6"
+    displayName: 'Saturday night build'
+    branches:
+      include:
+        - main
+    always: true
+
+trigger: none
+pr: none
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: EXTRACTED_FOLDER
+    value: $(ExtractedFolder)
+  - name: WSDKEnableBWOI
+    value: true
+  - name: URL_FEED
+    value: $(ADOFeedURL)
+  - name: skipNugetSecurityAnalysis
+    value: true # We explicitly call this task so we don't need it to be auto-injected
+
+pool:
+  vmImage: windows-2022
+
+jobs:
+  - job: DESKTOP_BUILD
+    displayName: 'Windows Desktop'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        # We have to use a nuget.config to provide the feed for the 'nuget install' option.
+        displayName: 'NuGet set package source to ADO feed'
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - task: NuGetCommand@2
+        displayName: NuGet Install WSDK x64
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet Install WSDK x86
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet Install WSDK arm64
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: CopyFiles@2
+        displayName: Set up Directory.Build.props
+        inputs:
+          SourceFolder: build
+          Contents: 'Directory.Build.props'
+          TargetFolder: $(Build.SourcesDirectory)
+      - template: '/.azuredevops/templates/DirectXTex-build-win32.yml'
+
+  - job: UWP_BUILD
+    displayName: 'Universal Windows Platform (UWP)'
+    timeoutInMinutes: 240
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        displayName: NuGet set package source to ADO feed
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - task: NuGetCommand@2
+        displayName: NuGet Install WSDK x64
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet Install WSDK x86
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet Install WSDK arm64
+        inputs:
+          command: custom
+          arguments: install -prerelease Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: CopyFiles@2
+        displayName: Set up Directory.Build.props
+        inputs:
+          SourceFolder: build
+          Contents: 'Directory.Build.props'
+          TargetFolder: $(Build.SourcesDirectory)
+      - template: '/.azuredevops/templates/DirectXTex-build-uwp.yml'

.azuredevops/pipelines/DirectXTex-GitHub-SDK-release.yml

@@ -0,0 +1,157 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library using the latest release of the Windows SDK from nuget.org.
+
+schedules:
+  - cron: "0 3 * * 0"
+    displayName: 'Sunday night build'
+    branches:
+      include:
+        - main
+    always: true
+
+trigger: none
+pr: none
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: EXTRACTED_FOLDER
+    value: $(ExtractedFolder)
+  - name: WSDKEnableBWOI
+    value: true
+  - name: URL_FEED
+    value: $(ADOFeedURL)
+  - name: skipNugetSecurityAnalysis
+    value: true # We explicitly call this task so we don't need it to be auto-injected
+
+pool:
+  vmImage: windows-2022
+
+jobs:
+  - job: DESKTOP_BUILD
+    displayName: 'Windows Desktop'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        # We have to use a nuget.config to provide the feed for the 'nuget install' option.
+        displayName: 'NuGet set package source to ADO feed'
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - task: NuGetCommand@2
+        displayName: NuGet Install WSDK x64
+        inputs:
+          command: custom
+          arguments: install Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet Install WSDK x86
+        inputs:
+          command: custom
+          arguments: install Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet Install WSDK arm64
+        inputs:
+          command: custom
+          arguments: install Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: CopyFiles@2
+        displayName: Set up Directory.Build.props
+        inputs:
+          SourceFolder: build
+          Contents: 'Directory.Build.props'
+          TargetFolder: $(Build.SourcesDirectory)
+      - template: '/.azuredevops/templates/DirectXTex-build-win32.yml'
+
+  - job: UWP_BUILD
+    displayName: 'Universal Windows Platform (UWP)'
+    timeoutInMinutes: 240
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        displayName: NuGet set package source to ADO feed
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - task: NuGetCommand@2
+        displayName: NuGet Install WSDK x64
+        inputs:
+          command: custom
+          arguments: install Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet Install WSDK x86
+        inputs:
+          command: custom
+          arguments: install Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: NuGetCommand@2
+        displayName: NuGet Install WSDK arm64
+        inputs:
+          command: custom
+          arguments: install Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+      - task: CopyFiles@2
+        displayName: Set up Directory.Build.props
+        inputs:
+          SourceFolder: build
+          Contents: 'Directory.Build.props'
+          TargetFolder: $(Build.SourcesDirectory)
+      - template: '/.azuredevops/templates/DirectXTex-build-uwp.yml'

.azuredevops/pipelines/DirectXTex-GitHub-Test-Dev17.yml

@@ -0,0 +1,300 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library and test suite.
+
+schedules:
+  - cron: "30 3 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+# GitHub Actions handles test suite for CI/PR
+trigger: none
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    include:
+      - '.azuredevops/pipelines/DirectXTex-GitHub-Test-Dev17.yml'
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+    - repository: testRepo
+      name: walbourn/directxtextest
+      type: github
+      endpoint: microsoft
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+pool:
+  vmImage: windows-2022
+
+variables:
+  Codeql.Enabled: false
+  VC_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
+  GUID_FEED: $(ADOFeedGUID)
+
+jobs:
+  - job: DESKTOP_BUILD
+    displayName: 'Windows Desktop'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    strategy:
+      maxParallel: 3
+      matrix:
+        Release_arm64:
+          BuildPlatform: ARM64
+          BuildConfiguration: Release
+        Debug_arm64:
+          BuildPlatform: ARM64
+          BuildConfiguration: Debug
+        Release_x64:
+          BuildPlatform: x64
+          BuildConfiguration: Release
+        Debug_x64:
+          BuildPlatform: x64
+          BuildConfiguration: Debug
+        Release_x86:
+          BuildPlatform: x86
+          BuildConfiguration: Release
+        Debug_x86:
+          BuildPlatform: x86
+          BuildConfiguration: Debug
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: testRepo
+        displayName: Fetch Tests
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/Tests'
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: NuGetCommand@2
+        displayName: NuGet restore tests
+        inputs:
+          solution: Tests/DirectXTex_Tests_Desktop_2022.sln
+          feedRestore: $(GUID_FEED)
+          includeNuGetOrg: false
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Tests_Desktop_2022.sln
+        inputs:
+          solution: Tests/DirectXTex_Tests_Desktop_2022.sln
+          vsVersion: 17.0
+          msbuildArgs: /p:PreferredToolArchitecture=x64
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+          msbuildArchitecture: x64
+        condition: ne(variables['BuildPlatform'], 'ARM64')
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Tests_Desktop_2022_Win10.sln
+        inputs:
+          solution: Tests/DirectXTex_Tests_Desktop_2022_Win10.sln
+          vsVersion: 17.0
+          msbuildArgs: /p:PreferredToolArchitecture=x64
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+          msbuildArchitecture: x64
+
+  - job: CMAKE_BUILD_X64
+    displayName: 'CMake for X64 BUILD_TESTING=ON'
+    timeoutInMinutes: 120
+    workspace:
+      clean: all
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: testRepo
+        displayName: Fetch Tests
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/Tests'
+      - task: CmdLine@2
+        displayName: Setup environment for CMake to use VS
+        inputs:
+          script: |
+            call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
+            echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
+            echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
+            echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
+            echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
+            echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
+            echo ##vso[task.prependpath]%VCToolsInstallDir%bin\Hostx64\x64
+            echo ##vso[task.setvariable variable=EXTERNAL_INCLUDE;]%EXTERNAL_INCLUDE%
+            echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
+            echo ##vso[task.setvariable variable=LIB;]%LIB%
+
+      - task: CMake@1
+        displayName: CMake (MSVC; x64-Debug) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug
+      - task: CMake@1
+        displayName: CMake (MSVC; x64-Debug) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/x64-Debug -v
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out'
+      - task: CMake@1
+        displayName: CMake (MSVC; x64-Release) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Release
+      - task: CMake@1
+        displayName: CMake (MSVC; x64-Release) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/x64-Release -v
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out'
+      - task: CMake@1
+        displayName: CMake (clang/LLVM; x64-Debug) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug-Clang
+      - task: CMake@1
+        displayName: CMake (clang/LLVM; x64-Debug) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/x64-Debug-Clang -v
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out'
+      - task: CMake@1
+        displayName: CMake (clang/LLVM; x64-Release) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Release-Clang
+      - task: CMake@1
+        displayName: CMake (clang/LLVM; x64-Release) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/x64-Release-Clang -v
+
+  - job: CMAKE_BUILD_ARM64
+    displayName: 'CMake for ARM64 BUILD_TESTING=ON'
+    timeoutInMinutes: 120
+    workspace:
+      clean: all
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: testRepo
+        displayName: Fetch Tests
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/Tests'
+      - task: CmdLine@2
+        displayName: Setup environment for CMake to use VS
+        inputs:
+          script: |
+            call "$(VC_PATH)\Auxiliary\Build\vcvarsamd64_arm64.bat"
+            echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
+            echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
+            echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
+            echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
+            echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
+            echo ##vso[task.prependpath]%VCToolsInstallDir%bin\Hostx64\arm64
+            echo ##vso[task.setvariable variable=EXTERNAL_INCLUDE;]%EXTERNAL_INCLUDE%
+            echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
+            echo ##vso[task.setvariable variable=LIB;]%LIB%
+
+      - task: CMake@1
+        displayName: CMake (MSVC; arm64-Debug) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=arm64-Debug
+      - task: CMake@1
+        displayName: CMake (MSVC; arm64-Debug) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/arm64-Debug -v
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out'
+      - task: CMake@1
+        displayName: CMake (MSVC; arm64-Release) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=arm64-Release
+      - task: CMake@1
+        displayName: CMake (MSVC; arm64-Release) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/arm64-Release -v
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out'
+      - task: CMake@1
+        displayName: CMake (clang/LLVM; arm64-Debug) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=arm64-Debug-Clang
+      - task: CMake@1
+        displayName: CMake (clang/LLVM; arm64-Debug) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/arm64-Debug-Clang -v
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out'
+      - task: CMake@1
+        displayName: CMake (clang/LLVM; arm64-Release) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=arm64-Release-Clang
+      - task: CMake@1
+        displayName: CMake (clang/LLVM; arm64-Release) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/arm64-Release-Clang -v
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out'
+      - task: CMake@1
+        displayName: CMake (MSVC; arm64ec-Debug) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=arm64ec-Debug
+      - task: CMake@1
+        displayName: CMake (MSVC; arm64ec-Debug) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/arm64ec-Debug -v
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out'
+      - task: CMake@1
+        displayName: CMake (MSVC; arm64ec-Release) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=arm64ec-Release
+      - task: CMake@1
+        displayName: CMake (MSVC; arm64ec-Release) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/arm64ec-Release -v

.azuredevops/pipelines/DirectXTex-GitHub-Test.yml

@@ -0,0 +1,187 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library and test suite.
+
+schedules:
+  - cron: "30 3 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+# GitHub Actions handles test suite for CI/PR
+trigger: none
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    include:
+      - '.azuredevops/pipelines/DirectXTex-GitHub-Test.yml'
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+    - repository: testRepo
+      name: walbourn/directxtextest
+      type: github
+      endpoint: microsoft
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+pool:
+  vmImage: windows-2019
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: VC_PATH
+    value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
+  - name: GUID_FEED
+    value: $(ADOFeedGUID)
+
+jobs:
+  - job: DESKTOP_BUILD
+    displayName: 'Windows Desktop'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    strategy:
+      maxParallel: 2
+      matrix:
+        Release_x64:
+          BuildPlatform: x64
+          BuildConfiguration: Release
+        Debug_x64:
+          BuildPlatform: x64
+          BuildConfiguration: Debug
+        Release_x86:
+          BuildPlatform: x86
+          BuildConfiguration: Release
+        Debug_x86:
+          BuildPlatform: x86
+          BuildConfiguration: Debug
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: testRepo
+        displayName: Fetch Tests
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/Tests'
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: NuGetCommand@2
+        displayName: NuGet restore tests
+        inputs:
+          solution: Tests/DirectXTex_Tests_Desktop_2019.sln
+          feedRestore: $(GUID_FEED)
+          includeNuGetOrg: false
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Tests_Desktop_2019.sln
+        inputs:
+          solution: Tests/DirectXTex_Tests_Desktop_2019.sln
+          vsVersion: 16.0
+          msbuildArgs: /p:PreferredToolArchitecture=x64
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Tests_Desktop_2019_Win10.sln
+        inputs:
+          solution: Tests/DirectXTex_Tests_Desktop_2019_Win10.sln
+          vsVersion: 16.0
+          msbuildArgs: /p:PreferredToolArchitecture=x64
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+
+  - job: CMAKE_BUILD_X64
+    displayName: 'CMake for X64 BUILD_TESTING=ON'
+    timeoutInMinutes: 120
+    workspace:
+      clean: all
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: testRepo
+        displayName: Fetch Tests
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/Tests'
+      - task: CmdLine@2
+        displayName: Setup environment for CMake to use VS
+        inputs:
+          script: |
+            call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
+            echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
+            echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
+            echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
+            echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
+            echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
+            echo ##vso[task.prependpath]%VCToolsInstallDir%bin\Hostx64\x64
+            echo ##vso[task.setvariable variable=EXTERNAL_INCLUDE;]%EXTERNAL_INCLUDE%
+            echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
+            echo ##vso[task.setvariable variable=LIB;]%LIB%
+
+      - task: CMake@1
+        displayName: CMake (MSVC; x64-Debug) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug
+      - task: CMake@1
+        displayName: CMake (MSVC; x64-Debug) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/x64-Debug -v
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out'
+      - task: CMake@1
+        displayName: CMake (MSVC; x64-Release) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Release
+      - task: CMake@1
+        displayName: CMake (MSVC; x64-Release) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/x64-Release -v
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out'
+      - task: CMake@1
+        displayName: CMake (clang/LLVM; x64-Debug) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug-Clang
+      - task: CMake@1
+        displayName: CMake (clang/LLVM; x64-Debug) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/x64-Debug-Clang -v
+      - task: DeleteFiles@1
+        inputs:
+          Contents: 'out'
+      - task: CMake@1
+        displayName: CMake (clang/LLVM; x64-Release) Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Release-Clang
+      - task: CMake@1
+        displayName: CMake (clang/LLVM; x64-Release) Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/x64-Release-Clang -v

.azuredevops/pipelines/DirectXTex-GitHub-VCPKG.yml

@@ -0,0 +1,171 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library and test suite using MSBuild+VCPKO
+
+schedules:
+  - cron: "0 5 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+trigger:
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+      - '*.md'
+      - LICENSE
+      - '.github/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/OneFuzz*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+      - '*.md'
+      - LICENSE
+      - '.github/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/OneFuzz*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+  drafts: false
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+    - repository: vcpkgRepo
+      name: Microsoft/vcpkg
+      type: github
+      endpoint: microsoft
+      ref: refs/tags/$(VCPKG_TAG)
+    - repository: testRepo
+      name: walbourn/directxtextest
+      type: github
+      endpoint: microsoft
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+pool:
+  vmImage: windows-2022
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: VCPKG_ROOT
+    value: '$(Build.SourcesDirectory)/vcpkg'
+  - name: VCPKG_CMAKE_DIR
+    value: '$(Build.SourcesDirectory)/vcpkg/scripts/buildsystems/vcpkg.cmake'
+  - name: VCPKG_MANIFEST_DIR
+    value: '$(Build.SourcesDirectory)/build'
+
+jobs:
+  - job: VCPKG_BUILD
+    displayName: 'Build with MSBuild+VCPKG'
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: vcpkgRepo
+        displayName: Fetch VCPKG
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/vcpkg'
+      - task: CmdLine@2
+        displayName: VCPKG Bootstrap
+        inputs:
+          script: |
+            call bootstrap-vcpkg.bat
+            echo ##vso[task.setvariable variable=VCPKG_DEFAULT_TRIPLET;]x64-windows
+            echo ##vso[task.setvariable variable=VCPKG_DEFAULT_HOST_TRIPLET;]x64-windows
+
+          workingDirectory: $(Build.SourcesDirectory)\vcpkg
+      - task: CmdLine@2
+        displayName: VCPKG install packages
+        inputs:
+          script: |
+            call vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=x64-windows
+            call vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=x86-windows
+            call vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=arm64-windows
+
+          workingDirectory: $(VCPKG_ROOT)
+      - task: PowerShell@2
+        displayName: Setup VCPKG Directory.Build.props and .target files
+        inputs:
+          targetType: inline
+          script: |
+            $props = "<Project>`n  <Import Project=`"`$(MSBuildThisFileDirectory)vcpkg\scripts\buildsystems\msbuild\vcpkg.props`" />`n</Project>`n"
+            $targets = "<Project>`n  <Import Project=`"`$(MSBuildThisFileDirectory)vcpkg\scripts\buildsystems\msbuild\vcpkg.targets`" />`n</Project>`n"
+            Set-Content -Path "Directory.Build.props" -Value $props
+            Set-Content -Path "Directory.Build.targets" -Value $targets
+
+          workingDirectory: $(Build.SourcesDirectory)
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Desktop_2022_Win10.sln 32dbg
+        inputs:
+          solution: DirectXTex_Desktop_2022_Win10.sln
+          msbuildArgs: /p:PreferredToolArchitecture=x64
+          platform: x86
+          configuration: Debug
+          msbuildArchitecture: x64
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Desktop_2022_Win10.sln 32rel
+        inputs:
+          solution: DirectXTex_Desktop_2022_Win10.sln
+          msbuildArgs: /p:PreferredToolArchitecture=x64
+          platform: x86
+          configuration: Release
+          msbuildArchitecture: x64
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Desktop_2022_Win10.sln 64dbg
+        inputs:
+          solution: DirectXTex_Desktop_2022_Win10.sln
+          msbuildArgs: /p:PreferredToolArchitecture=x64
+          platform: x64
+          configuration: Debug
+          msbuildArchitecture: x64
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Desktop_2022_Win10.sln 64rel
+        inputs:
+          solution: DirectXTex_Desktop_2022_Win10.sln
+          msbuildArgs: /p:PreferredToolArchitecture=x64
+          platform: x64
+          configuration: Release
+          msbuildArchitecture: x64
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Desktop_2022_Win10.sln arm64dbg
+        inputs:
+          solution: DirectXTex_Desktop_2022_Win10.sln
+          msbuildArgs: /p:PreferredToolArchitecture=x64
+          platform: ARM64
+          configuration: Debug
+          msbuildArchitecture: x64
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Desktop_2022_Win10.sln arm64rel
+        inputs:
+          solution: DirectXTex_Desktop_2022_Win10.sln
+          msbuildArgs: /p:PreferredToolArchitecture=x64
+          platform: ARM64
+          configuration: Release
+          msbuildArchitecture: x64

.azuredevops/pipelines/DirectXTex-GitHub-WSL-11.yml

@@ -0,0 +1,267 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library for Windows Subsystem for Linux (WSL)
+
+schedules:
+  - cron: "0 3 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+trigger: none
+
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    include:
+      - '.azuredevops/pipelines/DirectXTex-GitHub-WSL-11.yml'
+      - CMake*
+      - build/*.cmake
+      - build/*.in
+      - Auxiliary/*EXR*
+      - Auxiliary/*JPEG*
+      - Auxiliary/*PNG*
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+      trigger: none
+    - repository: dxHeadersRepo
+      name: Microsoft/DirectX-Headers
+      type: github
+      endpoint: microsoft
+      ref: refs/heads/main
+    - repository: dxMathRepo
+      name: Microsoft/DirectXMath
+      type: github
+      endpoint: microsoft
+      ref: refs/heads/main
+    - repository: vcpkgRepo
+      name: Microsoft/vcpkg
+      type: github
+      endpoint: microsoft
+      ref: refs/tags/$(VCPKG_TAG)
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+pool:
+  vmImage: ubuntu-22.04
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: VCPKG_ROOT
+    value: '$(Build.SourcesDirectory)/vcpkg'
+  - name: VCPKG_CMAKE_DIR
+    value: '$(Build.SourcesDirectory)/vcpkg/scripts/buildsystems/vcpkg.cmake'
+  - name: VCPKG_MANIFEST_DIR
+    value: '$(Build.SourcesDirectory)/build'
+  - name: LOCAL_PKG_DIR
+    value: '$(Agent.BuildDirectory)/install/'
+  - name: SAL_URL
+    value: https://raw.githubusercontent.com/dotnet/runtime/v8.0.1/src/coreclr/pal/inc/rt/sal.h
+  - name: SAL_HASH
+    value: 0f5a80b97564217db2ba3e4624cc9eb308e19cc9911dae21d983c4ab37003f4756473297ba81b386c498514cedc1ef5a3553d7002edc09aeb6a1335df973095f
+
+jobs:
+  - job: BUILD_WSL
+    displayName: 'Windows Subsystem for Linux (WSL)'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: dxHeadersRepo
+        displayName: Fetch DirectX-Headers
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/DirectX-Headers'
+      - checkout: dxMathRepo
+        displayName: Fetch DirectX-Math
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/DirectXMath'
+      - task: CMake@1
+        displayName: CMake DirectX-Headers
+        inputs:
+          cwd: DirectX-Headers
+          cmakeArgs: >
+            . -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF
+            -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR)
+      - task: CMake@1
+        displayName: CMake DirectX-Headers (Build)
+        inputs:
+          cwd: DirectX-Headers
+          cmakeArgs: --build . -v
+      - task: CMake@1
+        displayName: CMake DirectX-Headers (Install)
+        inputs:
+          cwd: DirectX-Headers
+          cmakeArgs: --install .
+      - task: CMake@1
+        displayName: CMake DirectXMath
+        inputs:
+          cwd: DirectXMath
+          cmakeArgs: . -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR)
+      - task: CMake@1
+        displayName: CMake DirectXMath (Build)
+        inputs:
+          cwd: DirectXMath
+          cmakeArgs: --build . -v
+      - task: CMake@1
+        displayName: CMake DirectXMath (Install)
+        inputs:
+          cwd: DirectXMath
+          cmakeArgs: --install .
+      - task: PowerShell@2
+        displayName: Fetch SAL.H
+        inputs:
+          targetType: inline
+          script: |
+            $ProgressPreference = 'SilentlyContinue'
+            Invoke-WebRequest -Uri "$(SAL_URL)" -OutFile $(LOCAL_PKG_DIR)/include/sal.h
+            $fileHash = Get-FileHash -Algorithm SHA512 $(LOCAL_PKG_DIR)/include/sal.h | ForEach { $_.Hash} | Out-String
+            $filehash = $fileHash.Trim()
+            Write-Host "##[debug]SHA512: " $filehash
+            if ($fileHash -ne "$(SAL_HASH)") {
+                Write-Error -Message "##[error]Computed hash does not match!" -ErrorAction Stop
+            }
+
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) dbg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out -DCMAKE_BUILD_TYPE=Debug
+            -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) dbg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out -v
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) rel
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out2 -DCMAKE_BUILD_TYPE=Release
+            -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) rel
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out2 -v
+
+  - job: BUILD_WSL_VCPKG
+    displayName: 'Windows Subsystem for Linux (WSL) using VCPKG'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: vcpkgRepo
+        displayName: Fetch VCPKG
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/vcpkg'
+      - task: Bash@3
+        displayName: VCPKG Bootstrap
+        inputs:
+          targetType: filePath
+          filePath: $(Build.SourcesDirectory)/vcpkg/bootstrap-vcpkg.sh
+          workingDirectory: $(Build.SourcesDirectory)/vcpkg
+      - task: CmdLine@2
+        displayName: GCC and CMake version
+        inputs:
+          script: |
+            g++ --version
+            cmake --version
+
+      - task: CmdLine@2
+        displayName: VCPKG install packages
+        inputs:
+          script: vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=x64-linux
+          workingDirectory: $(VCPKG_ROOT)
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) dbg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out -DCMAKE_BUILD_TYPE=Debug -DDIRECTX_ARCH=x64
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-linux
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) dbg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out -v
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) rel
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out2 -DCMAKE_BUILD_TYPE=Release -DDIRECTX_ARCH=x64
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-linux
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) rel
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out2 -v
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) w/ OpenEXR
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out3 -DCMAKE_BUILD_TYPE=Debug -DENABLE_OPENEXR_SUPPORT=ON -DDIRECTX_ARCH=x64
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-linux
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) w/ OpenEXR
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out3 -v
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) w/ libjpeg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out4 -DCMAKE_BUILD_TYPE=Debug -DENABLE_LIBJPEG_SUPPORT=ON -DDIRECTX_ARCH=x64
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-linux
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) w/ libjpeg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out4 -v
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) w/ libpng
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out5 -DCMAKE_BUILD_TYPE=Debug -DENABLE_LIBPNG_SUPPORT=ON -DDIRECTX_ARCH=x64
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-linux
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) w/ libpng
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out5 -v

.azuredevops/pipelines/DirectXTex-GitHub-WSL-13.yml

@@ -0,0 +1,267 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library for Windows Subsystem for Linux (WSL)
+
+schedules:
+  - cron: "0 3 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+trigger: none
+
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    include:
+      - '.azuredevops/pipelines/DirectXTex-GitHub-WSL-13.yml'
+      - CMake*
+      - build/*.cmake
+      - build/*.in
+      - Auxiliary/*EXR*
+      - Auxiliary/*JPEG*
+      - Auxiliary/*PNG*
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+      trigger: none
+    - repository: dxHeadersRepo
+      name: Microsoft/DirectX-Headers
+      type: github
+      endpoint: microsoft
+      ref: refs/heads/main
+    - repository: dxMathRepo
+      name: Microsoft/DirectXMath
+      type: github
+      endpoint: microsoft
+      ref: refs/heads/main
+    - repository: vcpkgRepo
+      name: Microsoft/vcpkg
+      type: github
+      endpoint: microsoft
+      ref: refs/tags/$(VCPKG_TAG)
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+pool:
+  vmImage: ubuntu-24.04
+
+variables:
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: VCPKG_ROOT
+    value: '$(Build.SourcesDirectory)/vcpkg'
+  - name: VCPKG_CMAKE_DIR
+    value: '$(Build.SourcesDirectory)/vcpkg/scripts/buildsystems/vcpkg.cmake'
+  - name: VCPKG_MANIFEST_DIR
+    value: '$(Build.SourcesDirectory)/build'
+  - name: LOCAL_PKG_DIR
+    value: '$(Agent.BuildDirectory)/install/'
+  - name: SAL_URL
+    value: https://raw.githubusercontent.com/dotnet/runtime/v8.0.1/src/coreclr/pal/inc/rt/sal.h
+  - name: SAL_HASH
+    value: 0f5a80b97564217db2ba3e4624cc9eb308e19cc9911dae21d983c4ab37003f4756473297ba81b386c498514cedc1ef5a3553d7002edc09aeb6a1335df973095f
+
+jobs:
+  - job: BUILD_WSL
+    displayName: 'Windows Subsystem for Linux (WSL)'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: dxHeadersRepo
+        displayName: Fetch DirectX-Headers
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/DirectX-Headers'
+      - checkout: dxMathRepo
+        displayName: Fetch DirectX-Math
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/DirectXMath'
+      - task: CMake@1
+        displayName: CMake DirectX-Headers
+        inputs:
+          cwd: DirectX-Headers
+          cmakeArgs: >
+            . -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF
+            -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR)
+      - task: CMake@1
+        displayName: CMake DirectX-Headers (Build)
+        inputs:
+          cwd: DirectX-Headers
+          cmakeArgs: --build . -v
+      - task: CMake@1
+        displayName: CMake DirectX-Headers (Install)
+        inputs:
+          cwd: DirectX-Headers
+          cmakeArgs: --install .
+      - task: CMake@1
+        displayName: CMake DirectXMath
+        inputs:
+          cwd: DirectXMath
+          cmakeArgs: . -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR)
+      - task: CMake@1
+        displayName: CMake DirectXMath (Build)
+        inputs:
+          cwd: DirectXMath
+          cmakeArgs: --build . -v
+      - task: CMake@1
+        displayName: CMake DirectXMath (Install)
+        inputs:
+          cwd: DirectXMath
+          cmakeArgs: --install .
+      - task: PowerShell@2
+        displayName: Fetch SAL.H
+        inputs:
+          targetType: inline
+          script: |
+            $ProgressPreference = 'SilentlyContinue'
+            Invoke-WebRequest -Uri "$(SAL_URL)" -OutFile $(LOCAL_PKG_DIR)/include/sal.h
+            $fileHash = Get-FileHash -Algorithm SHA512 $(LOCAL_PKG_DIR)/include/sal.h | ForEach { $_.Hash} | Out-String
+            $filehash = $fileHash.Trim()
+            Write-Host "##[debug]SHA512: " $filehash
+            if ($fileHash -ne "$(SAL_HASH)") {
+                Write-Error -Message "##[error]Computed hash does not match!" -ErrorAction Stop
+            }
+
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) dbg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out -DCMAKE_BUILD_TYPE=Debug
+            -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) dbg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out -v
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) rel
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out2 -DCMAKE_BUILD_TYPE=Release
+            -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) rel
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out2 -v
+
+  - job: BUILD_WSL_VCPKG
+    displayName: 'Windows Subsystem for Linux (WSL) using VCPKG'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: vcpkgRepo
+        displayName: Fetch VCPKG
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/vcpkg'
+      - task: Bash@3
+        displayName: VCPKG Bootstrap
+        inputs:
+          targetType: filePath
+          filePath: $(Build.SourcesDirectory)/vcpkg/bootstrap-vcpkg.sh
+          workingDirectory: $(Build.SourcesDirectory)/vcpkg
+      - task: CmdLine@2
+        displayName: GCC and CMake version
+        inputs:
+          script: |
+            g++ --version
+            cmake --version
+
+      - task: CmdLine@2
+        displayName: VCPKG install packages
+        inputs:
+          script: vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=x64-linux
+          workingDirectory: $(VCPKG_ROOT)
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) dbg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out -DCMAKE_BUILD_TYPE=Debug -DDIRECTX_ARCH=x64
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-linux
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) dbg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out -v
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) rel
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out2 -DCMAKE_BUILD_TYPE=Release -DDIRECTX_ARCH=x64
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-linux
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) rel
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out2 -v
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) w/ OpenEXR
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out3 -DCMAKE_BUILD_TYPE=Debug -DENABLE_OPENEXR_SUPPORT=ON -DDIRECTX_ARCH=x64
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-linux
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) w/ OpenEXR
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out3 -v
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) w/ libjpeg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out4 -DCMAKE_BUILD_TYPE=Debug -DENABLE_LIBJPEG_SUPPORT=ON -DDIRECTX_ARCH=x64
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-linux
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) w/ libjpeg
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out4 -v
+      - task: CMake@1
+        displayName: CMake DirectXTex (Config) w/ libpng
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: >
+            -B out5 -DCMAKE_BUILD_TYPE=Debug -DENABLE_LIBPNG_SUPPORT=ON -DDIRECTX_ARCH=x64
+            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
+            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-linux
+      - task: CMake@1
+        displayName: CMake DirectXTex (Build) w/ libpng
+        inputs:
+          cwd: $(Build.SourcesDirectory)
+          cmakeArgs: --build out5 -v

.azuredevops/pipelines/DirectXTex-GitHub.yml

@@ -0,0 +1,97 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library for Windows Desktop.
+
+schedules:
+  - cron: "5 3 * * *"
+    displayName: 'Nightly build'
+    branches:
+      include:
+        - main
+
+# GitHub Actions handles MSBuild for CI/PR
+trigger: none
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    include:
+      - '.azuredevops/pipelines/DirectXTex-GitHub.yml'
+      - DirectXTex/Shaders/CompileShaders.cmd
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+variables:
+  Codeql.Enabled: false
+
+pool:
+  vmImage: windows-2019
+
+jobs:
+  - job: DESKTOP_BUILD
+    displayName: 'Windows Desktop'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    strategy:
+      maxParallel: 2
+      matrix:
+        Release_x64:
+          BuildPlatform: x64
+          BuildConfiguration: Release
+          SpectreMitigation: false
+        Debug_x64:
+          BuildPlatform: x64
+          BuildConfiguration: Debug
+          SpectreMitigation: false
+        Release_x86:
+          BuildPlatform: x86
+          BuildConfiguration: Release
+          SpectreMitigation: false
+        Debug_x86:
+          BuildPlatform: x86
+          BuildConfiguration: Debug
+          SpectreMitigation: false
+        Release_x64_SpectreMitigated:
+          BuildPlatform: x64
+          BuildConfiguration: Release
+          SpectreMitigation: 'Spectre'
+        Debug_x64_SpectreMitigated:
+          BuildPlatform: x64
+          BuildConfiguration: Debug
+          SpectreMitigation: 'Spectre'
+        Release_x86_SpectreMitigated:
+          BuildPlatform: x86
+          BuildConfiguration: Release
+          SpectreMitigation: 'Spectre'
+        Debug_x86_SpectreMitigated:
+          BuildPlatform: x86
+          BuildConfiguration: Debug
+          SpectreMitigation: 'Spectre'
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Desktop_2019.sln
+        inputs:
+          solution: DirectXTex_Desktop_2019.sln
+          msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=$(SpectreMitigation)
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+      - task: VSBuild@1
+        displayName: Build solution DirectXTex_Desktop_2019_Win10.sln
+        inputs:
+          solution: DirectXTex_Desktop_2019_Win10.sln
+          msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=$(SpectreMitigation)
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'

.azuredevops/pipelines/DirectXTex-OneFuzz-Coverage.yml

@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+# OneFuzz code coverage pipeline
+
+pr: none
+trigger: none
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+    - repository: testRepo
+      name: walbourn/directxtextest
+      type: github
+      endpoint: microsoft
+      ref: refs/heads/main
+
+pool:
+  vmImage: windows-latest
+
+parameters:
+  - name: sasUrl
+    type: string
+    displayName: SAS URL
+  - name: branch
+    type: string
+    displayName: Branch
+  - name: jobID
+    type: string
+    displayName: OneFuzz Job ID
+  - name: buildDate
+    type: string
+    displayName: Build Date
+  - name: commitID
+    type: string
+    displayName: Commit ID
+
+variables:
+  - name: coverage-file
+    value: cobertura-coverage.xml
+  - name: job-ID
+    value: ${{ parameters.jobID }}
+  - name: build-date
+    value: ${{ parameters.buildDate }}
+  - name: branch
+    value: ${{ parameters.branch }}
+  - name: sas-url
+    value: ${{ parameters.sasUrl }}
+  - name: commit-ID
+    value: ${{ parameters.commitID }}
+
+jobs:
+  - job: prod
+    displayName: Prod Task
+    workspace:
+      clean: all
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: testRepo
+        displayName: Fetch Tests
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/Tests'
+      - powershell: |
+          Write-Host "Job ID: $(job-ID), Build Date: $(build-date), Branch: $(branch)"
+          $SASUrl = [System.Uri]::new("$(sas-url)")
+          azcopy cp $SASUrl.AbsoluteUri ./ --recursive
+          $ContainerName = $SASURL.LocalPath.Split("/")[1]
+          Write-Host "##vso[task.setvariable variable=container-name;]$ContainerName"
+          cd $ContainerName
+          $size = ((Get-Item .\$(coverage-file)).length)
+          if ($size -eq 0) {
+            Write-Host "Cobertura coverage XML is empty."
+            exit 1
+          }
+        displayName: 'Get code coverage from OneFuzz'
+
+      - task: PublishCodeCoverageResults@1
+        inputs:
+          codeCoverageTool: 'Cobertura'
+          summaryFileLocation: ./$(container-name)\$(coverage-file)
+          pathToSources: $(Build.SourcesDirectory)
+        displayName: 'Generate coverage report'

.azuredevops/pipelines/DirectXTex-OneFuzz.yml

@@ -0,0 +1,152 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+# Builds the library using CMake and submit for file fuzzing
+
+schedules:
+  - cron: "0 12 1 * *"
+    displayName: 'Submit for File Fuzzing (Monthly)'
+    branches:
+      include:
+        - main
+    always: true
+
+trigger: none
+pr: none
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+    - repository: testRepo
+      name: walbourn/directxtextest
+      type: github
+      endpoint: microsoft
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+variables:
+  Codeql.Enabled: false
+  VS_GENERATOR: 'Visual Studio 17 2022'
+  WIN11_SDK: '10.0.22000.0'
+
+pool:
+  vmImage: windows-2022
+
+jobs:
+  - job: FUZZ_BUILD
+    displayName: 'Build for file fuzzing'
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's'
+      - checkout: testRepo
+        displayName: Fetch Tests
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+        path: 's/Tests'
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config with ASan'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out
+            -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_TOOLS=OFF -DBUILD_SAMPLE=OFF
+            -DBUILD_FUZZING=ON -DBUILD_TESTING=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build with ASan'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out -v --config RelWithDebInfo
+      - task: CopyFiles@2
+        displayName: Copy fuzzer
+        inputs:
+          Contents: |
+            build\OneFuzzConfig.json
+            out\bin\RelWithDebInfo\fuzzloaders.exe
+          TargetFolder: .drop
+          OverWrite: true
+          flattenFolders: true
+      - task: CopyFiles@2
+        displayName: Copy symbols
+        inputs:
+          Contents: |
+            out\bin\RelWithDebInfo\fuzzloaders.pdb
+          TargetFolder: .drop\symbols
+          OverWrite: true
+          flattenFolders: true
+      - task: PowerShell@2
+        displayName: Download seed files
+        inputs:
+          targetType: inline
+          script: |
+            $seedfiles = "AlphaEdge.dds",
+                "cubea8r8g8b8.dds",
+                "default_texture_nm.dds",
+                "dx5_logo.dds",
+                "hdrtest.dds",
+                "normalmap.dds",
+                "grad4d.hdr",
+                "grad4dunc.hdr",
+                "BigTree.hdr",
+                "CBW8.TGA",
+                "ccm8.tga",
+                "CTC16.TGA",
+                "CTC24.TGA",
+                "CTC32.TGA",
+                "UTC16.TGA",
+                "UTC24.TGA",
+                "UTC32.TGA",
+                "UBW8.TGA",
+                "ucm8.tga",
+                "testimg.ppm",
+                "grad4d.pfm",
+                "grad4d.phm",
+                "grad4d_mono.pfm",
+                "grad4d_mono.phm";
+
+            New-Item -ItemType Directory -Force -Path .drop\seeds\
+
+            foreach($filename in $seedfiles)
+            {
+                Write-Host "Fetching: $filename"
+                $url = "https://raw.githubusercontent.com/walbourn/directxtexmedia/main/" + $filename
+                $target = [System.IO.Path]::Combine(".drop\seeds\", $filename)
+                Invoke-WebRequest -Uri $url -OutFile $target
+            }
+
+      - task: PowerShell@2
+        displayName: Copy OneFuzz setup script
+        inputs:
+          targetType: 'inline'
+          script: |
+            Copy-Item -Path .\build\onefuzz-setup.ps1 -Destination .drop/setup.ps1
+
+      - task: MSBuild@1
+        displayName: 'Copy ASan binaries'
+        inputs:
+          solution: build/CopyASAN.targets
+          msbuildArguments: /p:TargetFolder=$(Build.SourcesDirectory)\.drop
+          msbuildVersion: 17.0
+          msbuildArchitecture: x64
+      - task: PowerShell@2
+        displayName: List drop files
+        inputs:
+          targetType: inline
+          script: |
+            Get-ChildItem ".drop" -Recurse | select FullName
+
+      - task: onefuzz-task@0
+        displayName: 'Submit to OneFuzz'
+        inputs:
+          onefuzzOSes: 'Windows'
+        env:
+          onefuzzDropDirectory: $(Build.SourcesDirectory)\.drop
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)

.azuredevops/pipelines/DirectXTex-SDL.yml

@@ -0,0 +1,201 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+# Runs various SDL recommended tools on the code.
+
+schedules:
+  - cron: "0 3 * * 0,3,5"
+    displayName: 'Three times a week'
+    branches:
+      include:
+        - main
+    always: true
+
+# GitHub Actions handles CodeQL and PREFAST for CI/PR
+trigger: none
+pr:
+  branches:
+    include:
+      - main
+  paths:
+    include:
+      - '.azuredevops/pipelines/DirectXTex-SDL.yml'
+
+resources:
+  repositories:
+    - repository: self
+      type: git
+      ref: refs/heads/main
+
+name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
+
+variables:
+  Codeql.Enabled: true
+  Codeql.Language: cpp
+  VC_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
+  VS_GENERATOR: 'Visual Studio 17 2022'
+
+pool:
+  vmImage: windows-2022
+
+jobs:
+  - job: SDL_BUILD
+    displayName: 'Build using required SDL tools'
+    workspace:
+      clean: all
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NodeTool@0
+        displayName: 'NPM install'
+        inputs:
+          versionSpec: 14.x
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
+        displayName: 'Run Credential Scanner'
+        inputs:
+          debugMode: false
+          folderSuppression: false
+      - task: PoliCheck@2
+        displayName: 'Run PoliCheck'
+        inputs:
+          result: PoliCheck.xml
+      - task: Armory@2
+        displayName: Run ARMory
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out -DENABLE_SPECTRE_MITIGATION=ON
+      - task: CodeQL3000Init@0
+        inputs:
+          Enabled: true
+      - task: VSBuild@1
+        displayName: 'Build C++ with CodeQL'
+        inputs:
+          solution: '$(Build.SourcesDirectory)/out/DirectXTex.sln'
+          vsVersion: 17.0
+          platform: x64
+          configuration: Release
+          msbuildArchitecture: x64
+      - task: CodeQL3000Finalize@0
+        condition: always()
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out -v --config RelWithDebInfo
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@4
+        displayName: 'Run AntiMalware'
+        inputs:
+          InputType: 'Basic'
+          ScanType: 'CustomScan'
+          FileDirPath: $(Agent.BuildDirectory)
+          EnableSERVICEs: true
+          SupportLogOnError: false
+          TreatSignatureUpdateFailureAs: 'Warning'
+          SignatureFreshness: 'OneDay'
+          TreatStaleSignatureAs: 'Error'
+        condition: always()
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@4
+        displayName: 'Run BinSkim'
+        inputs:
+          AnalyzeTargetBinskim: ''
+          AnalyzeTargetGlob: +:file|out\bin\**\RelWithDebInfo\*.exe
+          AnalyzeVerbose: true
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@2
+        displayName: 'Post Analysis'
+        inputs:
+          GdnBreakAllTools: true
+          GdnBreakPolicy: 'Microsoft'
+          GdnBreakPolicyMinSev: 'Error'
+      - task: ComponentGovernanceComponentDetection@0
+        displayName: Component Detection
+
+  - job: SDL_BUILD_DLL
+    displayName: 'Build using required SDL tools for DLLs'
+    workspace:
+      clean: all
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NodeTool@0
+        displayName: 'NPM install'
+        inputs:
+          versionSpec: 14.x
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Config x64'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: >
+            -G "$(VS_GENERATOR)" -A x64 -B out
+            -DENABLE_SPECTRE_MITIGATION=ON -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF
+      - task: CMake@1
+        displayName: 'CMake (MSVC): Build x64 Release'
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out -v --config RelWithDebInfo
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@4
+        displayName: 'Run AntiMalware'
+        inputs:
+          InputType: 'Basic'
+          ScanType: 'CustomScan'
+          FileDirPath: $(Agent.BuildDirectory)
+          EnableSERVICEs: true
+          SupportLogOnError: false
+          TreatSignatureUpdateFailureAs: 'Warning'
+          SignatureFreshness: 'OneDay'
+          TreatStaleSignatureAs: 'Error'
+        condition: always()
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@4
+        displayName: 'Run BinSkim'
+        inputs:
+          AnalyzeTargetBinskim: ''
+          AnalyzeTargetGlob: +:file|out\bin\**\RelWithDebInfo\*.dll
+          AnalyzeVerbose: true
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@2
+        displayName: 'Post Analysis'
+        inputs:
+          GdnBreakAllTools: true
+          GdnBreakPolicy: 'Microsoft'
+          GdnBreakPolicyMinSev: 'Error'
+      - task: ComponentGovernanceComponentDetection@0
+        displayName: Component Detection
+
+  - job: VC_PREFAST
+    displayName: 'Build using /analyze (PREFAST)'
+    workspace:
+      clean: all
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: CmdLine@2
+        displayName: Setup environment for CMake to use VS
+        inputs:
+          script: |
+            call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
+            echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
+            echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
+            echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
+            echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
+            echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
+            echo ##vso[task.prependpath]%VCToolsInstallDir%bin\Hostx64\x64
+            echo ##vso[task.setvariable variable=EXTERNAL_INCLUDE;]%EXTERNAL_INCLUDE%
+            echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
+            echo ##vso[task.setvariable variable=LIB;]%LIB%
+
+      - task: CMake@1
+        displayName: CMake Config
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --preset=x64-Debug -DENABLE_CODE_ANALYSIS=ON
+      - task: CMake@1
+        displayName: CMake Build
+        inputs:
+          cwd: '$(Build.SourcesDirectory)'
+          cmakeArgs: --build out/build/x64-Debug

.azuredevops/policies/approvercountpolicy.yml

@@ -0,0 +1,20 @@
+name: approver_count
+description: Approver count policy for mscodehub/DirectXTex/DirectXTex repository
+resource: repository
+where:
+configuration:
+  approverCountPolicySettings:
+    isBlocking: true
+    requireMinimumApproverCount: 1
+    creatorVoteCounts: false
+    allowDownvotes: false
+    sourcePushOptions:
+      resetOnSourcePush: false
+      requireVoteOnLastIteration: true
+      requireVoteOnEachIteration: false
+      resetRejectionsOnSourcePush: false
+    blockLastPusherVote: true
+    branchNames:
+      - refs/heads/release
+      - refs/heads/main
+    displayName: mscodehub/DirectXTex/DirectXTex Approver Count Policy

.azuredevops/templates/DirectXTex-build-gdk.yml

@@ -0,0 +1,120 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+# Template used by GitHub-GDK-* pipelines
+
+parameters:
+  - name: msVersion
+    type: string
+    values:
+      - '16.0'
+      - '17.0'
+  - name: vsYear
+    type: number
+    values:
+      - 2019
+      - 2022
+
+steps:
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_GDK_${{ parameters.vsYear }} pcdbg
+    continueOnError: true
+    inputs:
+      solution: DirectXTex_GDK_${{ parameters.vsYear }}.sln
+      vsVersion: ${{ parameters.msVersion }}
+      platform: Gaming.Desktop.x64
+      configuration: Debug
+      msbuildArchitecture: x64
+      msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_GDK_${{ parameters.vsYear }} pcrel
+    continueOnError: true
+    inputs:
+      solution: DirectXTex_GDK_${{ parameters.vsYear }}.sln
+      vsVersion: ${{ parameters.msVersion }}
+      platform: Gaming.Desktop.x64
+      configuration: Release
+      msbuildArchitecture: x64
+      msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_GDK_${{ parameters.vsYear }} xbdbg
+    continueOnError: true
+    inputs:
+      solution: DirectXTex_GDK_${{ parameters.vsYear }}.sln
+      vsVersion: ${{ parameters.msVersion }}
+      platform: Gaming.Xbox.XboxOne.x64
+      configuration: Debug
+      msbuildArchitecture: x64
+      msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_GDK_${{ parameters.vsYear }} xbrel
+    continueOnError: true
+    inputs:
+      solution: DirectXTex_GDK_${{ parameters.vsYear }}.sln
+      vsVersion: ${{ parameters.msVersion }}
+      platform: Gaming.Xbox.XboxOne.x64
+      configuration: Release
+      msbuildArchitecture: x64
+      msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_GDK_${{ parameters.vsYear }} scardbg
+    continueOnError: true
+    inputs:
+      solution: DirectXTex_GDK_${{ parameters.vsYear }}.sln
+      vsVersion: ${{ parameters.msVersion }}
+      platform: Gaming.Xbox.Scarlett.x64
+      configuration: Debug
+      msbuildArchitecture: x64
+      msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_GDK_${{ parameters.vsYear }} scarrel
+    continueOnError: true
+    inputs:
+      solution: DirectXTex_GDK_${{ parameters.vsYear }}.sln
+      vsVersion: ${{ parameters.msVersion }}
+      platform: Gaming.Xbox.Scarlett.x64
+      configuration: Release
+      msbuildArchitecture: x64
+      msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_GDK_PC_${{ parameters.vsYear }} dbg
+    continueOnError: true
+    inputs:
+      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.sln
+      vsVersion: ${{ parameters.msVersion }}
+      platform: x64
+      configuration: Debug
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64 /p:GDKEditionNumber=$(GDK_EDITION)
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_GDK_PC_${{ parameters.vsYear }} rel
+    continueOnError: true
+    inputs:
+      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.sln
+      vsVersion: ${{ parameters.msVersion }}
+      platform: x64
+      configuration: Release
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64 /p:GDKEditionNumber=$(GDK_EDITION)
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_GDK_PC_${{ parameters.vsYear }} scardbg
+    continueOnError: true
+    inputs:
+      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.sln
+      vsVersion: ${{ parameters.msVersion }}
+      platform: x64
+      configuration: Debug_Scarlett
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64 /p:GDKEditionNumber=$(GDK_EDITION)
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_GDK_PC_${{ parameters.vsYear }} scarrel
+    continueOnError: true
+    inputs:
+      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.sln
+      vsVersion: ${{ parameters.msVersion }}
+      platform: x64
+      configuration: Release_Scarlett
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64 /p:GDKEditionNumber=$(GDK_EDITION)

.azuredevops/templates/DirectXTex-build-uwp.yml

@@ -0,0 +1,57 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+# Template used by SDK-release and SDK-prerelease pipelines
+
+steps:
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Windows10_2022.sln 32dbg
+    inputs:
+      solution: DirectXTex_Windows10_2022.sln
+      platform: x86
+      configuration: Debug
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Windows10_2022.sln 32rel
+    inputs:
+      solution: DirectXTex_Windows10_2022.sln
+      platform: x86
+      configuration: Release
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Windows10_2022.sln 64dbg
+    inputs:
+      solution: DirectXTex_Windows10_2022.sln
+      platform: x64
+      configuration: Debug
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Windows10_2022.sln 64rel
+    inputs:
+      solution: DirectXTex_Windows10_2022.sln
+      platform: x64
+      configuration: Release
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  # Windows on ARM 32-bit is deprecated. https://learn.microsoft.com/windows/arm/arm32-to-arm64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Windows10_2022.sln arm64dbg
+    inputs:
+      solution: DirectXTex_Windows10_2022.sln
+      platform: ARM64
+      configuration: Debug
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Windows10_2022.sln arm64rel
+    inputs:
+      solution: DirectXTex_Windows10_2022.sln
+      platform: ARM64
+      configuration: Release
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64

.azuredevops/templates/DirectXTex-build-win32.yml

@@ -0,0 +1,89 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+# Template used by SDK-release and SDK-prerelease pipelines
+
+steps:
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Desktop_2019.sln 32dbg
+    inputs:
+      solution: DirectXTex_Desktop_2019.sln
+      platform: x86
+      configuration: Debug
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Desktop_2019.sln 32rel
+    inputs:
+      solution: DirectXTex_Desktop_2019.sln
+      platform: x86
+      configuration: Release
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Desktop_2019.sln 64dbg
+    inputs:
+      solution: DirectXTex_Desktop_2019.sln
+      platform: x64
+      configuration: Debug
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Desktop_2019.sln 64rel
+    inputs:
+      solution: DirectXTex_Desktop_2019.sln
+      platform: x64
+      configuration: Release
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Desktop_2019_Win10.sln 32dbg
+    inputs:
+      solution: DirectXTex_Desktop_2019_Win10.sln
+      platform: x86
+      configuration: Debug
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Desktop_2019_Win10.sln 32rel
+    inputs:
+      solution: DirectXTex_Desktop_2019_Win10.sln
+      platform: x86
+      configuration: Release
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Desktop_2019_Win10.sln 64dbg
+    inputs:
+      solution: DirectXTex_Desktop_2019_Win10.sln
+      platform: x64
+      configuration: Debug
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Desktop_2019_Win10.sln 64rel
+    inputs:
+      solution: DirectXTex_Desktop_2019_Win10.sln
+      platform: x64
+      configuration: Release
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  # VS 2019 for Win32 on ARM64 is out of support.
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Desktop_2022_Win10.sln arm64dbg
+    inputs:
+      solution: DirectXTex_Desktop_2022_Win10.sln
+      platform: ARM64
+      configuration: Debug
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64
+  - task: VSBuild@1
+    displayName: Build solution DirectXTex_Desktop_2022_Win10.sln arm64rel
+    inputs:
+      solution: DirectXTex_Desktop_2022_Win10.sln
+      platform: ARM64
+      configuration: Release
+      msbuildArchitecture: x64
+      msbuildArgs: /p:PreferredToolArchitecture=x64

.editorconfig

@@ -1,5 +1,13 @@
 root = true
 
+[*.{yml}]
+indent_size = 2
+indent_style = space
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = crlf
+charset = latin1
+
 [*.{fx,fxh,hlsl,hlsli}]
 indent_size = 4
 indent_style = space

.gitattributes

@@ -14,6 +14,7 @@
 *.vcxproj eol=crlf
 *.filters eol=crlf
 *.sln eol=crlf
+*.yml eol=crlf
 
 # Explicitly declare resource files as binary
 *.pdb binary

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: monthly

.github/linters/.editorconfig-checker.json

@@ -0,0 +1,9 @@
+{
+    "Format": "github-actions",
+    "exclude": [
+        ".git",
+        "LICENSE",
+        "Tests",
+        "Common/d3dx12.h"
+    ]
+}

.github/linters/.markdown-lint.yml

@@ -0,0 +1,20 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# line-length
+MD013: false
+
+# blanks-around-headings
+MD022: false
+
+# blanks-around-lists
+MD032: false
+
+# no-inline-html
+MD033: false
+
+# no-bare-urls
+MD034: false
+
+# first-line-heading
+MD041: false

.github/linters/.powershell-psscriptanalyzer.psd1

@@ -0,0 +1,5 @@
+# PSScriptAnalyzerSettings.psd1
+@{
+    Severity=@('Error','Warning')
+    ExcludeRules=@('PSAvoidUsingWriteHost')
+}

.github/linters/.yaml-lint.yml

@@ -0,0 +1,17 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ignore-from-file: .gitignore
+
+extends: default
+
+rules:
+  truthy:
+    check-keys: false
+  document-start: disable
+  line-length:
+    max: 160
+  comments:
+    min-spaces-from-content: 1
+  new-lines:
+    type: dos

.github/workflows/bvt.yml

@@ -0,0 +1,133 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+name: 'CTest (BVTs)'
+
+on:
+  push:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+  pull_request:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-2022
+    timeout-minutes: 60
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        toolver: ['14.29', '14']
+        build_type: [x64-Release]
+        arch: [amd64]
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Clone test repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          repository: walbourn/directxtextest
+          path: Tests
+          ref: main
+
+      - name: 'Install Ninja'
+        run: choco install ninja
+
+      - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+        with:
+          arch: ${{ matrix.arch }}
+          toolset: ${{ matrix.toolver }}
+
+      - name: 'Set triplet'
+        shell: pwsh
+        run: |
+          if ("${{ matrix.arch }}" -eq "amd64")
+          {
+              echo "VCPKG_DEFAULT_TRIPLET=x64-windows" >> $env:GITHUB_ENV
+          }
+          elseif ("${{ matrix.arch }}" -eq "amd64_x86")
+          {
+              echo "VCPKG_DEFAULT_TRIPLET=x86-windows" >> $env:GITHUB_ENV
+          }
+          elseif ("${{ matrix.arch }}" -eq "amd64_arm64")
+          {
+              if ("${{ matrix.build_type }}" -match "^arm64ec")
+              {
+                  echo "VCPKG_DEFAULT_TRIPLET=arm64ec-windows" >> $env:GITHUB_ENV
+              }
+              else
+              {
+                  echo "VCPKG_DEFAULT_TRIPLET=arm64-windows" >> $env:GITHUB_ENV
+              }
+          }
+          else
+          {
+              echo "::error Unknown architecture/build-type triplet mapping"
+          }
+
+      - name: Get vcpkg commit hash
+        shell: pwsh
+        run: |
+          if ($Env:vcpkgRelease) {
+              echo "Using vcpkg commit from repo variable..."
+              $VCPKG_COMMIT_ID = $Env:vcpkgRelease
+          }
+          else {
+              echo "Fetching latest vcpkg commit hash..."
+              $commit = (git ls-remote https://github.com/microsoft/vcpkg.git HEAD | Select-String -Pattern '([a-f0-9]{40})').Matches.Value
+              $VCPKG_COMMIT_ID = $commit
+          }
+          Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID"
+          echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV
+        env:
+          vcpkgRelease: '${{ vars.VCPKG_COMMIT_ID }}'
+
+      - uses: lukka/run-vcpkg@7d259227a1fb6471a0253dd5ab7419835228f7d7 # v11
+        with:
+          runVcpkgInstall: true
+          vcpkgJsonGlob: '**/build/vcpkg.json'
+          vcpkgGitCommitId: '${{ env.VCPKG_COMMIT_ID }}'
+
+      - name: 'Configure CMake'
+        working-directory: ${{ github.workspace }}
+        run: >
+          cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=ON -DBUILD_TOOLS=OFF -DBUILD_SAMPLE=OFF -DBUILD_BVT=ON
+          -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
+          -DVCPKG_TARGET_TRIPLET="${env:VCPKG_DEFAULT_TRIPLET}"
+
+      - name: 'Build'
+        working-directory: ${{ github.workspace }}
+        run: cmake --build out\build\${{ matrix.build_type }}
+
+      - name: 'Run BVTs'
+        working-directory: ${{ github.workspace }}
+        run: ctest --preset=${{ matrix.build_type }} --output-on-failure

.github/workflows/codeql.yml

@@ -0,0 +1,78 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+name: "CodeQL"
+
+on:
+  push:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+  pull_request:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+  schedule:
+    - cron: '43 3 * * 3'
+
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    name: Analyze (C/C++)
+    runs-on: windows-latest
+    timeout-minutes: 360
+    permissions:
+      actions: read  # for github/codeql-action/init to get workflow details
+      contents: read  # for actions/checkout to fetch code
+      security-events: write  # for github/codeql-action/autobuild to send a status report
+      packages: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: 'Install Ninja'
+        run: choco install ninja
+
+      - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        with:
+          languages: c-cpp
+          build-mode: manual
+
+      - name: 'Configure CMake'
+        working-directory: ${{ github.workspace }}
+        run: cmake --preset=x64-Debug
+
+      - name: 'Build'
+        working-directory: ${{ github.workspace }}
+        run: cmake --build out\build\x64-Debug
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        with:
+          category: "/language:c-cpp"

.github/workflows/lint.yml

@@ -0,0 +1,46 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+name: Lint
+
+on:
+  pull_request:
+    branches: "main"
+    paths-ignore:
+      - LICENSE
+      - build/*.in
+
+permissions: {}
+
+jobs:
+  analyze:
+    permissions:
+      contents: read
+      packages: read
+      statuses: write
+    name: Lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+
+      - name: Lint Code Base
+        uses: super-linter/super-linter@12150456a73e248bdc94d0794898f94e23127c88 # v7.4.0
+        env:
+          DEFAULT_BRANCH: origin/main
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          IGNORE_GITIGNORED_FILES: true
+          VALIDATE_ALL_CODEBASE: true
+          VALIDATE_CHECKOV: true
+          VALIDATE_EDITORCONFIG: true
+          VALIDATE_GITHUB_ACTIONS: true
+          VALIDATE_JSON: true
+          VALIDATE_MARKDOWN: true
+          VALIDATE_POWERSHELL: true
+          VALIDATE_GITLEAKS: true
+          VALIDATE_YAML: true

.github/workflows/main.yml

@@ -0,0 +1,144 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+name: 'CMake (Windows)'
+
+on:
+  push:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+  pull_request:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-2022
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        toolver: ['14.29', '14']
+        build_type: [x64-Debug, x64-Release]
+        arch: [amd64]
+        include:
+          - toolver: '14.29'
+            build_type: x86-Debug
+            arch: amd64_x86
+          - toolver: '14.29'
+            build_type: x86-Release
+            arch: amd64_x86
+          - toolver: '14'
+            build_type: x86-Debug
+            arch: amd64_x86
+          - toolver: '14'
+            build_type: x86-Release
+            arch: amd64_x86
+          - toolver: '14'
+            build_type: arm64-Debug
+            arch: amd64_arm64
+          - toolver: '14'
+            build_type: arm64-Release
+            arch: amd64_arm64
+          - toolver: '14'
+            build_type: arm64ec-Debug
+            arch: amd64_arm64
+          - toolver: '14'
+            build_type: arm64ec-Release
+            arch: amd64_arm64
+          - toolver: '14'
+            build_type: x64-Debug-Win8
+            arch: amd64
+          - toolver: '14'
+            build_type: x64-Release-Win8
+            arch: amd64
+          - toolver: '14'
+            build_type: x64-Debug-Clang
+            arch: amd64
+          - toolver: '14'
+            build_type: x64-Release-Clang
+            arch: amd64
+          - toolver: '14'
+            build_type: x86-Debug-Clang
+            arch: amd64_x86
+          - toolver: '14'
+            build_type: x86-Release-Clang
+            arch: amd64_x86
+          - toolver: '14'
+            build_type: arm64-Debug-Clang
+            arch: amd64_arm64
+          - toolver: '14'
+            build_type: arm64-Release-Clang
+            arch: amd64_arm64
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: 'Install Ninja'
+        run: choco install ninja
+
+      - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+        with:
+          arch: ${{ matrix.arch }}
+          toolset: ${{ matrix.toolver }}
+
+      - name: 'Configure CMake'
+        working-directory: ${{ github.workspace }}
+        run: cmake --preset=${{ matrix.build_type }}
+
+      - name: 'Build'
+        working-directory: ${{ github.workspace }}
+        run: cmake --build out\build\${{ matrix.build_type }}
+
+      - name: 'Clean up'
+        working-directory: ${{ github.workspace }}
+        run: Remove-Item -Path out -Recurse -Force
+
+      - if: matrix.arch != 'amd64_arm64'
+        name: 'Configure CMake (Spectre)'
+        working-directory: ${{ github.workspace }}
+        run: cmake --preset=${{ matrix.build_type }} -DENABLE_SPECTRE_MITIGATION=ON
+
+      - if: matrix.arch != 'amd64_arm64'
+        name: 'Build (Spectre)'
+        working-directory: ${{ github.workspace }}
+        run: cmake --build out\build\${{ matrix.build_type }}
+
+      - if: matrix.arch != 'amd64_arm64'
+        name: 'Clean up'
+        working-directory: ${{ github.workspace }}
+        run: Remove-Item -Path out -Recurse -Force
+
+      - name: 'Configure CMake (DLL)'
+        working-directory: ${{ github.workspace }}
+        run: cmake --preset=${{ matrix.build_type }} -DBUILD_SHARED_LIBS=ON
+
+      - name: 'Build (DLL)'
+        working-directory: ${{ github.workspace }}
+        run: cmake --build out\build\${{ matrix.build_type }}

.github/workflows/msbuild.yml

@@ -0,0 +1,84 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+name: MSBuild
+
+on:
+  push:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*
+  pull_request:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-2022 # has v142 tools but not v142 spectre libs
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        vs: [2019, 2022]
+        build_type: [Debug, Release]
+        platform: [x86, x64, ARM64]
+        exclude:
+          - vs: 2019
+            platform: ARM64
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Add MSBuild to PATH
+        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
+
+      - if: matrix.platform != 'ARM64'
+        name: Build
+        working-directory: ${{ github.workspace }}
+        run: >
+          msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
+          DirectXTex_Desktop_${{ matrix.vs }}.sln
+
+      - name: 'Build (Windows 10)'
+        working-directory: ${{ github.workspace }}
+        run: >
+          msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
+          DirectXTex_Desktop_${{ matrix.vs }}_Win10.sln
+
+      - if: matrix.vs == '2022'
+        name: 'Build (UWP)'
+        working-directory: ${{ github.workspace }}
+        run: >
+          msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
+          DirectXTex_Windows10_2022.sln
+
+      - if: matrix.platform != 'ARM64' && matrix.vs != '2019'
+        name: 'Build (Spectre)'
+        working-directory: ${{ github.workspace }}
+        run: >
+          msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
+          /p:SpectreMitigation=Spectre
+          DirectXTex_Desktop_${{ matrix.vs }}.sln
+
+      - if: matrix.platform != 'ARM64' && matrix.vs != '2019'
+        name: 'Build (Spectre Windows 10)'
+        working-directory: ${{ github.workspace }}
+        run: >
+          msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
+          /p:SpectreMitigation=Spectre
+          DirectXTex_Desktop_${{ matrix.vs }}_Win10.sln

.github/workflows/msvc.yml

@@ -0,0 +1,88 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+name: Microsoft C++ Code Analysis
+
+on:
+  push:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+  pull_request:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+  schedule:
+    - cron: '41 16 * * 1'
+
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    permissions:
+      contents: read
+      security-events: write
+      actions: read
+    name: Analyze
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+        with:
+          arch: amd64
+
+      - name: Configure CMake
+        working-directory: ${{ github.workspace }}
+        run: cmake -B out -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
+
+      - name: 'Build Shaders (BC)'
+        shell: cmd
+        working-directory: ./DirectXTex/Shaders
+        run: CompileShaders.cmd
+        env:
+          CompileShadersOutput: ${{ github.workspace }}/out/Shaders/Compiled
+
+      - name: 'Build Shaders (DDSVIEW)'
+        shell: cmd
+        working-directory: ./DDSView
+        run: hlsl.cmd
+        env:
+          CompileShadersOutput: ${{ github.workspace }}/out/Shaders/Compiled
+
+      - name: Initialize MSVC Code Analysis
+        uses: microsoft/msvc-code-analysis-action@24c285ab36952c9e9182f4b78dfafbac38a7e5ee # v0.1.1
+        id: run-analysis
+        with:
+          cmakeBuildDirectory: ./out
+          buildConfiguration: Debug
+          ruleset: NativeRecommendedRules.ruleset
+
+      # Upload SARIF file to GitHub Code Scanning Alerts
+      - name: Upload SARIF to GitHub
+        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        with:
+          sarif_file: ${{ steps.run-analysis.outputs.sarif }}

.github/workflows/test.yml

@@ -0,0 +1,188 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+name: 'CTest (Windows)'
+
+on:
+  push:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+  pull_request:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+
+env:
+  DIRECTXTEX_MEDIA_PATH: ${{ github.workspace }}/Media
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-2022
+    timeout-minutes: 60
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        toolver: ['14.29', '14']
+        build_type: [x64-Debug, x64-Release]
+        arch: [amd64]
+        include:
+          - toolver: '14.29'
+            build_type: x86-Debug
+            arch: amd64_x86
+          - toolver: '14.29'
+            build_type: x86-Release
+            arch: amd64_x86
+          - toolver: '14'
+            build_type: x86-Debug
+            arch: amd64_x86
+          - toolver: '14'
+            build_type: x86-Release
+            arch: amd64_x86
+          - toolver: '14'
+            build_type: x64-Debug-Clang
+            arch: amd64
+          - toolver: '14'
+            build_type: x64-Release-Clang
+            arch: amd64
+          - toolver: '14'
+            build_type: x86-Debug-Clang
+            arch: amd64_x86
+          - toolver: '14'
+            build_type: x86-Release-Clang
+            arch: amd64_x86
+          - toolver: '14'
+            build_type: arm64-Debug
+            arch: amd64_arm64
+          - toolver: '14'
+            build_type: arm64-Release
+            arch: amd64_arm64
+          - toolver: '14'
+            build_type: arm64ec-Debug
+            arch: amd64_arm64
+          - toolver: '14'
+            build_type: arm64ec-Release
+            arch: amd64_arm64
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Clone test repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          repository: walbourn/directxtextest
+          path: Tests
+          ref: main
+
+      - name: 'Install Ninja'
+        run: choco install ninja
+
+      - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+        with:
+          arch: ${{ matrix.arch }}
+          toolset: ${{ matrix.toolver }}
+
+      - name: 'Set triplet'
+        shell: pwsh
+        run: |
+          if ("${{ matrix.arch }}" -eq "amd64")
+          {
+              echo "VCPKG_DEFAULT_TRIPLET=x64-windows" >> $env:GITHUB_ENV
+          }
+          elseif ("${{ matrix.arch }}" -eq "amd64_x86")
+          {
+              echo "VCPKG_DEFAULT_TRIPLET=x86-windows" >> $env:GITHUB_ENV
+          }
+          elseif ("${{ matrix.arch }}" -eq "amd64_arm64")
+          {
+              if ("${{ matrix.build_type }}" -match "^arm64ec")
+              {
+                  echo "VCPKG_DEFAULT_TRIPLET=arm64ec-windows" >> $env:GITHUB_ENV
+              }
+              else
+              {
+                  echo "VCPKG_DEFAULT_TRIPLET=arm64-windows" >> $env:GITHUB_ENV
+              }
+          }
+          else
+          {
+              echo "::error Unknown architecture/build-type triplet mapping"
+          }
+
+      - name: Get vcpkg commit hash
+        shell: pwsh
+        run: |
+          if ($Env:vcpkgRelease) {
+              echo "Using vcpkg commit from repo variable..."
+              $VCPKG_COMMIT_ID = $Env:vcpkgRelease
+          }
+          else {
+              echo "Fetching latest vcpkg commit hash..."
+              $commit = (git ls-remote https://github.com/microsoft/vcpkg.git HEAD | Select-String -Pattern '([a-f0-9]{40})').Matches.Value
+              $VCPKG_COMMIT_ID = $commit
+          }
+          Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID"
+          echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV
+        env:
+          vcpkgRelease: '${{ vars.VCPKG_COMMIT_ID }}'
+
+      - uses: lukka/run-vcpkg@7d259227a1fb6471a0253dd5ab7419835228f7d7 # v11
+        with:
+          runVcpkgInstall: true
+          vcpkgJsonGlob: '**/build/vcpkg.json'
+          vcpkgGitCommitId: '${{ env.VCPKG_COMMIT_ID }}'
+
+      - name: 'Configure CMake'
+        working-directory: ${{ github.workspace }}
+        run: >
+          cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=ON -DBUILD_TOOLS=OFF -DBUILD_SAMPLE=OFF
+          -DENABLE_LIBJPEG_SUPPORT=ON -DENABLE_LIBPNG_SUPPORT=ON
+          -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake"
+          -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
+          -DVCPKG_TARGET_TRIPLET="${env:VCPKG_DEFAULT_TRIPLET}"
+
+      - name: 'Build'
+        working-directory: ${{ github.workspace }}
+        run: cmake --build out\build\${{ matrix.build_type }}
+
+      - name: 'Clean up'
+        working-directory: ${{ github.workspace }}
+        run: Remove-Item -Path out -Recurse -Force
+
+      - name: 'Configure CMake (DLL)'
+        working-directory: ${{ github.workspace }}
+        run: >
+          cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=ON -DBUILD_TOOLS=OFF -DBUILD_SAMPLE=OFF
+          -DENABLE_LIBJPEG_SUPPORT=ON -DENABLE_LIBPNG_SUPPORT=ON
+          -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake"
+          -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
+          -DVCPKG_TARGET_TRIPLET="${env:VCPKG_DEFAULT_TRIPLET}" -DBUILD_SHARED_LIBS=ON
+
+      - name: 'Build (DLL)'
+        working-directory: ${{ github.workspace }}
+        run: cmake --build out\build\${{ matrix.build_type }}

.github/workflows/uwp.yml

@@ -0,0 +1,96 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# http://go.microsoft.com/fwlink/?LinkId=248926
+
+name: 'CMake (UWP)'
+
+on:
+  push:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+  pull_request:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-2022
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        build_type: [x64-Debug-UWP, x64-Release-UWP, x64-Debug-UWP-Clang, x64-Release-UWP-Clang]
+        arch: [amd64]
+        include:
+          - build_type: x86-Debug-UWP
+            arch: amd64_x86
+          - build_type: x86-Release-UWP
+            arch: amd64_x86
+          - build_type: x86-Debug-UWP-Clang
+            arch: amd64_x86
+          - build_type: x86-Release-UWP-Clang
+            arch: amd64_x86
+          - build_type: arm64-Debug-UWP
+            arch: amd64_arm64
+          - build_type: arm64-Release-UWP
+            arch: amd64_arm64
+          - build_type: arm64-Debug-UWP-Clang
+            arch: amd64_arm64
+          - build_type: arm64-Release-UWP-Clang
+            arch: amd64_arm64
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: 'Install Ninja'
+        run: choco install ninja
+
+      - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+        with:
+          arch: ${{ matrix.arch }}
+          uwp: true
+
+      - name: 'Configure CMake'
+        working-directory: ${{ github.workspace }}
+        run: cmake --preset=${{ matrix.build_type }}
+
+      - name: 'Build'
+        working-directory: ${{ github.workspace }}
+        run: cmake --build out\build\${{ matrix.build_type }}
+
+      - name: 'Clean up'
+        working-directory: ${{ github.workspace }}
+        run: Remove-Item -Path out -Recurse -Force
+
+      - name: 'Configure CMake (DLL)'
+        working-directory: ${{ github.workspace }}
+        run: cmake --preset=${{ matrix.build_type }} -DBUILD_SHARED_LIBS=ON
+
+      - name: 'Build (DLL)'
+        working-directory: ${{ github.workspace }}
+        run: cmake --build out\build\${{ matrix.build_type }}

.github/workflows/vcpkg.yml

@@ -0,0 +1,161 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+name: 'CMake (Windows using VCPKG)'
+
+on:
+  push:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - build/*.cmd
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+  pull_request:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - build/*.cmd
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-2022
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        toolver: ['14.29', '14']
+        build_type: [x64-Debug-VCPKG]
+        arch: [amd64]
+        shared: ['OFF']
+        include:
+          - toolver: '14'
+            build_type: x64-Debug-Clang-VCPKG
+            arch: amd64
+            shared: 'OFF'
+          - toolver: '14'
+            build_type: x86-Debug-VCPKG
+            arch: amd64_x86
+            shared: 'OFF'
+          - toolver: '14'
+            build_type: arm64-Debug-VCPKG
+            arch: amd64_arm64
+            shared: 'OFF'
+          - toolver: '14'
+            build_type: arm64ec-Debug-VCPKG
+            arch: amd64_arm64
+            shared: 'OFF'
+          - toolver: '14'
+            build_type: x64-Debug-MinGW
+            arch: amd64
+            shared: 'OFF'
+          - toolver: '14'
+            build_type: x64-Release-MinGW
+            arch: amd64
+            shared: 'OFF'
+          - toolver: '14'
+            build_type: x64-Debug-MinGW
+            arch: amd64
+            shared: 'ON'
+          - toolver: '14'
+            build_type: x64-Release-MinGW
+            arch: amd64
+            shared: 'ON'
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: 'Install Ninja'
+        run: choco install ninja
+
+      - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+        with:
+          arch: ${{ matrix.arch }}
+          toolset: ${{ matrix.toolver }}
+
+      - name: 'Set triplet'
+        shell: pwsh
+        run: |
+          if ("${{ matrix.arch }}" -eq "amd64")
+          {
+              if ("${{ matrix.build_type }}" -match "MinGW")
+              {
+                  echo "VCPKG_DEFAULT_TRIPLET=x64-mingw-static" >> $env:GITHUB_ENV
+              }
+              else
+              {
+                  echo "VCPKG_DEFAULT_TRIPLET=x64-windows" >> $env:GITHUB_ENV
+              }
+          }
+          elseif ("${{ matrix.arch }}" -eq "amd64_x86")
+          {
+              echo "VCPKG_DEFAULT_TRIPLET=x86-windows" >> $env:GITHUB_ENV
+          }
+          elseif ("${{ matrix.arch }}" -eq "amd64_arm64")
+          {
+              if ("${{ matrix.build_type }}" -match "^arm64ec")
+              {
+                  echo "VCPKG_DEFAULT_TRIPLET=arm64ec-windows" >> $env:GITHUB_ENV
+              }
+              else
+              {
+                  echo "VCPKG_DEFAULT_TRIPLET=arm64-windows" >> $env:GITHUB_ENV
+              }
+          }
+          else
+          {
+              echo "::error Unknown architecture/build-type triplet mapping"
+          }
+
+      - name: Get vcpkg commit hash
+        shell: pwsh
+        run: |
+          if ($Env:vcpkgRelease) {
+              echo "Using vcpkg commit from repo variable..."
+              $VCPKG_COMMIT_ID = $Env:vcpkgRelease
+          }
+          else {
+              echo "Fetching latest vcpkg commit hash..."
+              $commit = (git ls-remote https://github.com/microsoft/vcpkg.git HEAD | Select-String -Pattern '([a-f0-9]{40})').Matches.Value
+              $VCPKG_COMMIT_ID = $commit
+          }
+          Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID"
+          echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV
+        env:
+          vcpkgRelease: '${{ vars.VCPKG_COMMIT_ID }}'
+
+      - uses: lukka/run-vcpkg@7d259227a1fb6471a0253dd5ab7419835228f7d7 # v11
+        with:
+          runVcpkgInstall: true
+          vcpkgJsonGlob: '**/build/vcpkg.json'
+          vcpkgGitCommitId: '${{ env.VCPKG_COMMIT_ID }}'
+
+      - name: 'Configure CMake'
+        working-directory: ${{ github.workspace }}
+        run: >
+          cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=OFF
+          -DENABLE_OPENEXR_SUPPORT=ON -DENABLE_LIBJPEG_SUPPORT=ON -DENABLE_LIBPNG_SUPPORT=ON
+          -DBUILD_SHARED_LIBS=${{ matrix.shared }}
+          -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake"
+          -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
+          -DVCPKG_TARGET_TRIPLET="${env:VCPKG_DEFAULT_TRIPLET}"
+
+      - name: 'Build'
+        working-directory: ${{ github.workspace }}
+        run: cmake --build out\build\${{ matrix.build_type }}

.github/workflows/wsl.yml

@@ -0,0 +1,110 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# https://go.microsoft.com/fwlink/?LinkId=248926
+
+name: 'CMake (WSL)'
+
+on:
+  push:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+  pull_request:
+    branches: "main"
+    paths-ignore:
+      - '*.md'
+      - LICENSE
+      - '.azuredevops/**'
+      - '.nuget/*'
+      - build/*.cmd
+      - build/*.json
+      - build/*.props
+      - build/*.ps1
+      - build/*.targets
+      - build/*.xvd
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        build_type: [x64-Debug-Linux, x64-Release-Linux]
+        gcc: [12, 13, 14]
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: seanmiddleditch/gha-setup-ninja@3b1f8f94a2f8254bd26914c4ab9474d4f0015f67 # v6
+
+      - name: Get vcpkg commit hash
+        shell: pwsh
+        run: |
+          if ($Env:vcpkgRelease) {
+              echo "Using vcpkg commit from repo variable..."
+              $VCPKG_COMMIT_ID = $Env:vcpkgRelease
+          }
+          else {
+              echo "Fetching latest vcpkg commit hash..."
+              $commit = (git ls-remote https://github.com/microsoft/vcpkg.git HEAD | Select-String -Pattern '([a-f0-9]{40})').Matches.Value
+              $VCPKG_COMMIT_ID = $commit
+          }
+          Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID"
+          echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV
+        env:
+          vcpkgRelease: '${{ vars.VCPKG_COMMIT_ID }}'
+
+      - uses: lukka/run-vcpkg@7d259227a1fb6471a0253dd5ab7419835228f7d7 # v11
+        with:
+          runVcpkgInstall: true
+          vcpkgJsonGlob: '**/build/vcpkg.json'
+          vcpkgGitCommitId: '${{ env.VCPKG_COMMIT_ID }}'
+
+      - name: 'Configure CMake'
+        working-directory: ${{ github.workspace }}
+        run: >
+          cmake --preset=${{ matrix.build_type }} -DENABLE_OPENEXR_SUPPORT=ON -DENABLE_LIBJPEG_SUPPORT=ON -DENABLE_LIBPNG_SUPPORT=ON
+          -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
+          -DVCPKG_TARGET_TRIPLET="x64-linux"
+
+        env:
+          CC: gcc-${{ matrix.gcc }}
+          CXX: g++-${{ matrix.gcc }}
+
+      - name: 'Build'
+        working-directory: ${{ github.workspace }}
+        run: cmake --build out/build/${{ matrix.build_type }}
+
+      - name: 'Clean up'
+        working-directory: ${{ github.workspace }}
+        run: rm -rf out
+
+      - name: 'Configure CMake (-shared)'
+        working-directory: ${{ github.workspace }}
+        run: >
+          cmake --preset=${{ matrix.build_type }} -DENABLE_OPENEXR_SUPPORT=ON -DENABLE_LIBJPEG_SUPPORT=ON -DENABLE_LIBPNG_SUPPORT=ON
+          -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
+          -DVCPKG_TARGET_TRIPLET="x64-linux" -DBUILD_SHARED_LIBS=ON
+
+        env:
+          CC: gcc-${{ matrix.gcc }}
+          CXX: g++-${{ matrix.gcc }}
+
+      - name: 'Build (-shared)'
+        working-directory: ${{ github.workspace }}
+        run: cmake --build out/build/${{ matrix.build_type }}

.gitignore

@@ -38,3 +38,4 @@ x64
 /wiki
 /out
 /CMakeUserPresets.json
+/build/vcpkg_installed

.nuget/directxtex_desktop_2019.nuspec

@@ -7,10 +7,10 @@
         <authors>Microsoft</authors>
         <owners>microsoft,directxtk</owners>
         <summary>DirectXTex texture processing library</summary>
-        <description>This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022 and supports Windows 7 / DirectX 11.
+        <description>This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022 on Windows 8.1 or later.
 
 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>
-        <releaseNotes>Matches the December 31, 2023 release on GitHub.</releaseNotes>
+        <releaseNotes>Matches the March 24, 2025 release on GitHub.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkId=248926</projectUrl>
         <repository type="git" url="https://github.com/microsoft/DirectXTex.git" />
         <icon>images\icon.jpg</icon>

.nuget/directxtex_desktop_win10.nuspec

@@ -3,14 +3,14 @@
     <metadata minClientVersion="2.8.6">
         <id>directxtex_desktop_win10</id>
         <version>0.0.0-SpecifyVersionOnCommandline</version>
-        <title>DirectXTex Library (VS 2019/2022 Win32 for Windows 10/11)</title>
+        <title>DirectXTex Library (VS 2022 Win32 for Windows 10/11)</title>
         <authors>Microsoft</authors>
         <owners>microsoft,directxtk</owners>
         <summary>DirectXTex texture processing library</summary>
-        <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.
+        <description>This version is for Windows desktop applications using Visual Studio 2022 on 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.</description>
-        <releaseNotes>Matches the December 31, 2023 release on GitHub.</releaseNotes>
+        <releaseNotes>Matches the March 24, 2025 release on GitHub.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkId=248926</projectUrl>
         <repository type="git" url="https://github.com/microsoft/DirectXTex.git" />
         <icon>images\icon.jpg</icon>
@@ -18,7 +18,7 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
         <license type="expression">MIT</license>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
-        <tags>DirectX  DirectXTex  native nativepackage</tags>
+        <tags>DirectX  DirectXTex  native nativepackage  ARM64</tags>
     </metadata>
 
     <files>
@@ -28,41 +28,41 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
         <file target="include" src="DirectXTex\DirectXTex.h" />
         <file target="include" src="DirectXTex\DirectXTex.inl" />
 
-        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\Debug\*.lib" />
-        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\Debug\*.pdb" />
+        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\Win32\Debug\*.lib" />
+        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\Win32\Debug\*.pdb" />
 
-        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\DebugSpectre\*.lib" />
-        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\DebugSpectre\*.pdb" />
+        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\Win32\DebugSpectre\*.lib" />
+        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\Win32\DebugSpectre\*.pdb" />
 
-        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\Release\*.lib" />
-        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\Release\*.pdb" />
+        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2022_Win10\Win32\Release\*.lib" />
+        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2022_Win10\Win32\Release\*.pdb" />
 
-        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\ReleaseSpectre\*.lib" />
-        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\ReleaseSpectre\*.pdb" />
+        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2022_Win10\Win32\ReleaseSpectre\*.lib" />
+        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2022_Win10\Win32\ReleaseSpectre\*.pdb" />
 
-        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\x64\Debug\*.lib" />
-        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\x64\Debug\*.pdb" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\x64\Debug\*.lib" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\x64\Debug\*.pdb" />
 
-        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\x64\DebugSpectre\*.lib" />
-        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\x64\DebugSpectre\*.pdb" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\x64\DebugSpectre\*.lib" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\x64\DebugSpectre\*.pdb" />
 
-        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\x64\Release\*.lib" />
-        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\x64\Release\*.pdb" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2022_Win10\x64\Release\*.lib" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2022_Win10\x64\Release\*.pdb" />
 
-        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\x64\ReleaseSpectre\*.lib" />
-        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\x64\ReleaseSpectre\*.pdb" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2022_Win10\x64\ReleaseSpectre\*.lib" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2022_Win10\x64\ReleaseSpectre\*.pdb" />
 
-        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\Debug\*.lib" />
-        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\Debug\*.pdb" />
+        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\ARM64\Debug\*.lib" />
+        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\ARM64\Debug\*.pdb" />
 
-        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\DebugSpectre\*.lib" />
-        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\DebugSpectre\*.pdb" />
+        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\ARM64\DebugSpectre\*.lib" />
+        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\ARM64\DebugSpectre\*.pdb" />
 
-        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\Release\*.lib" />
-        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\Release\*.pdb" />
+        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2022_Win10\ARM64\Release\*.lib" />
+        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2022_Win10\ARM64\Release\*.pdb" />
 
-        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\ReleaseSpectre\*.lib" />
-        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\ReleaseSpectre\*.pdb" />
+        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2022_Win10\ARM64\ReleaseSpectre\*.lib" />
+        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2022_Win10\ARM64\ReleaseSpectre\*.pdb" />
 
         <file src=".nuget/directxtex_desktop_win10.targets" target="build\native" />
 

.nuget/directxtex_uwp.nuspec

@@ -7,10 +7,10 @@
         <authors>Microsoft</authors>
         <owners>microsoft,directxtk</owners>
         <summary>DirectXTex texture processing library</summary>
-        <description>This version is for Universal Windows Platform apps on Windows 10 / Windows 11 using Visual Studio 2019 (16.11) or Visual Studio 2022.
+        <description>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.</description>
-        <releaseNotes>Matches the December 31, 2023 release on GitHub.</releaseNotes>
+        <releaseNotes>Matches the March 24, 2025 release on GitHub.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkId=248926</projectUrl>
         <repository type="git" url="https://github.com/microsoft/DirectXTex.git" />
         <icon>images\icon.jpg</icon>
@@ -18,7 +18,7 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
         <license type="expression">MIT</license>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
-        <tags>DirectX  DirectXTex  native nativepackage</tags>
+        <tags>DirectX  DirectXTex  native nativepackage  ARM64</tags>
     </metadata>
 
     <files>
@@ -28,23 +28,23 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
         <file target="include" src="DirectXTex\DirectXTex.h" />
         <file target="include" src="DirectXTex\DirectXTex.inl" />
 
-        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Windows10_2019\ARM64\Debug\*.lib" />
-        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Windows10_2019\ARM64\Debug\*.pdb" />
+        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Windows10_2022\ARM64\Debug\*.lib" />
+        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Windows10_2022\ARM64\Debug\*.pdb" />
 
-        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Windows10_2019\ARM64\Release\*.lib" />
-        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Windows10_2019\ARM64\Release\*.pdb" />
+        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Windows10_2022\ARM64\Release\*.lib" />
+        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Windows10_2022\ARM64\Release\*.pdb" />
 
-        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Windows10_2019\Win32\Debug\*.lib" />
-        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Windows10_2019\Win32\Debug\*.pdb" />
+        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Windows10_2022\Win32\Debug\*.lib" />
+        <file target="native\lib\x86\Debug" src="DirectXTex\Bin\Windows10_2022\Win32\Debug\*.pdb" />
 
-        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Windows10_2019\Win32\Release\*.lib" />
-        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Windows10_2019\Win32\Release\*.pdb" />
+        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Windows10_2022\Win32\Release\*.lib" />
+        <file target="native\lib\x86\Release" src="DirectXTex\Bin\Windows10_2022\Win32\Release\*.pdb" />
 
-        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Windows10_2019\x64\Debug\*.lib" />
-        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Windows10_2019\x64\Debug\*.pdb" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Windows10_2022\x64\Debug\*.lib" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Windows10_2022\x64\Debug\*.pdb" />
 
-        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Windows10_2019\x64\Release\*.lib" />
-        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Windows10_2019\x64\Release\*.pdb" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Windows10_2022\x64\Release\*.lib" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Windows10_2022\x64\Release\*.pdb" />
 
         <file src=".nuget/directxtex_uwp.targets" target="build\native" />
 

Auxiliary/DirectXTexEXR.cpp

@@ -1,7 +1,7 @@
 //--------------------------------------------------------------------------------------
 // File: DirectXTexEXR.cpp
 //
-// DirectXTex Auxillary functions for using the OpenEXR library
+// DirectXTex Auxilary functions for using the OpenEXR library
 //
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
@@ -45,8 +45,13 @@
 #pragma warning(disable : 4244 4996)
 #include <ImfRgbaFile.h>
 #include <ImfIO.h>
+
+// https://openexr.com/en/latest/PortingGuide.html
+#include <OpenEXRConfig.h>
 #pragma warning(pop)
 
+#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + (100*OPENEXR_VERSION_MINOR) +  OPENEXR_VERSION_PATCH)
+
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
@@ -148,6 +153,13 @@ namespace
             SetLastError(0);
         }
 
+    #if COMBINED_OPENEXR_VERSION >= 30300
+        int64_t read(void *buf, uint64_t sz, uint64_t offset) override
+        {
+            return Imf::IStream::read(buf, sz, offset);
+        }
+    #endif
+
     private:
         HANDLE m_hFile;
         LONGLONG m_EOF;
@@ -157,7 +169,8 @@ namespace
     {
     public:
         OutputStream(HANDLE hFile, const char fileName[]) :
-            OStream(fileName), m_hFile(hFile) {}
+            OStream(fileName), m_hFile(hFile)
+        {}
 
         OutputStream(const OutputStream&) = delete;
         OutputStream& operator = (const OutputStream&) = delete;
@@ -220,7 +233,7 @@ HRESULT DirectX::GetMetadataFromEXRFile(const wchar_t* szFile, TexMetadata& meta
     const int nameLength = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, nullptr, 0, nullptr, nullptr);
     if (nameLength > 0)
     {
-        fileName.resize(nameLength);
+        fileName.resize(static_cast<size_t>(nameLength));
         const int result = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, fileName.data(), nameLength, nullptr, nullptr);
         if (result <= 0)
         {
@@ -228,19 +241,10 @@ HRESULT DirectX::GetMetadataFromEXRFile(const wchar_t* szFile, TexMetadata& meta
         }
     }
 
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
     ScopedHandle hFile(safe_handle(CreateFile2(
         szFile,
         GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
         nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(
-        szFile,
-        GENERIC_READ, FILE_SHARE_READ,
-        nullptr,
-        OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN,
-        nullptr)));
-#endif
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -256,32 +260,43 @@ HRESULT DirectX::GetMetadataFromEXRFile(const wchar_t* szFile, TexMetadata& meta
 
     try
     {
-#ifdef _WIN32
+    #ifdef _WIN32
         Imf::RgbaInputFile file(stream);
-#else
+    #else
         Imf::RgbaInputFile file(fileName.c_str());
-#endif
+    #endif
 
         const auto dw = file.dataWindow();
 
         const int width = dw.max.x - dw.min.x + 1;
-        const int height = dw.max.y - dw.min.y + 1;
+        int height = dw.max.y - dw.min.y + 1;
+        size_t arraySize = 1;
 
         if (width < 1 || height < 1)
             return E_FAIL;
 
+        if (file.header().find("envmap") != file.header().end())
+        {
+            if (width == height / 6)
+            {
+                height = width;
+                arraySize = 6;
+            }
+        }
+
         metadata.width = static_cast<size_t>(width);
         metadata.height = static_cast<size_t>(height);
-        metadata.depth = metadata.arraySize = metadata.mipLevels = 1;
+        metadata.depth = metadata.mipLevels = 1;
+        metadata.arraySize = arraySize;
         metadata.format = DXGI_FORMAT_R16G16B16A16_FLOAT;
         metadata.dimension = TEX_DIMENSION_TEXTURE2D;
     }
 #ifdef _WIN32
     catch (const com_exception& exc)
     {
-#ifdef _DEBUG
+    #ifdef _DEBUG
         OutputDebugStringA(exc.what());
-#endif
+    #endif
         hr = exc.get_result();
     }
 #endif
@@ -327,7 +342,7 @@ HRESULT DirectX::LoadFromEXRFile(const wchar_t* szFile, TexMetadata* metadata, S
     const int nameLength = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, nullptr, 0, nullptr, nullptr);
     if (nameLength > 0)
     {
-        fileName.resize(nameLength);
+        fileName.resize(static_cast<size_t>(nameLength));
         const int result = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, fileName.data(), nameLength, nullptr, nullptr);
         if (result <= 0)
         {
@@ -335,19 +350,10 @@ HRESULT DirectX::LoadFromEXRFile(const wchar_t* szFile, TexMetadata* metadata, S
         }
     }
 
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
     ScopedHandle hFile(safe_handle(CreateFile2(
         szFile,
         GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
         nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(
-        szFile,
-        GENERIC_READ, FILE_SHARE_READ,
-        nullptr,
-        OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN,
-        nullptr)));
-#endif
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -363,31 +369,43 @@ HRESULT DirectX::LoadFromEXRFile(const wchar_t* szFile, TexMetadata* metadata, S
 
     try
     {
-#ifdef _WIN32
+    #ifdef _WIN32
         Imf::RgbaInputFile file(stream);
-#else
+    #else
         Imf::RgbaInputFile file(fileName.c_str());
-#endif
+    #endif
 
-        auto const dw = file.dataWindow();
+        const auto dw = file.dataWindow();
 
         const int width = dw.max.x - dw.min.x + 1;
-        const int height = dw.max.y - dw.min.y + 1;
+        int height = dw.max.y - dw.min.y + 1;
+        size_t arraySize = 1;
 
         if (width < 1 || height < 1)
             return E_FAIL;
 
+        if (file.header().find("envmap") != file.header().end())
+        {
+            if (width == height / 6)
+            {
+                height = width;
+                arraySize = 6;
+            }
+        }
+
         if (metadata)
         {
             metadata->width = static_cast<size_t>(width);
             metadata->height = static_cast<size_t>(height);
-            metadata->depth = metadata->arraySize = metadata->mipLevels = 1;
+            metadata->depth = metadata->mipLevels = 1;
+            metadata->arraySize = arraySize;
             metadata->format = DXGI_FORMAT_R16G16B16A16_FLOAT;
             metadata->dimension = TEX_DIMENSION_TEXTURE2D;
         }
 
         hr = image.Initialize2D(DXGI_FORMAT_R16G16B16A16_FLOAT,
-            static_cast<size_t>(width), static_cast<size_t>(height), 1u, 1u);
+            static_cast<size_t>(width), static_cast<size_t>(height), arraySize, 1u);
+
         if (FAILED(hr))
             return hr;
 
@@ -397,9 +415,9 @@ HRESULT DirectX::LoadFromEXRFile(const wchar_t* szFile, TexMetadata* metadata, S
 #ifdef _WIN32
     catch (const com_exception& exc)
     {
-#ifdef _DEBUG
+    #ifdef _DEBUG
         OutputDebugStringA(exc.what());
-#endif
+    #endif
         hr = exc.get_result();
     }
 #endif
@@ -464,7 +482,7 @@ HRESULT DirectX::SaveToEXRFile(const Image& image, const wchar_t* szFile)
     const int nameLength = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, nullptr, 0, nullptr, nullptr);
     if (nameLength > 0)
     {
-        fileName.resize(nameLength);
+        fileName.resize(static_cast<size_t>(nameLength));
         const int result = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, fileName.data(), nameLength, nullptr, nullptr);
         if (result <= 0)
         {
@@ -473,19 +491,10 @@ HRESULT DirectX::SaveToEXRFile(const Image& image, const wchar_t* szFile)
     }
 
     // Create file and write header
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
     ScopedHandle hFile(safe_handle(CreateFile2(
         szFile,
         GENERIC_WRITE, 0, CREATE_ALWAYS,
         nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(
-        szFile,
-        GENERIC_WRITE, 0,
-        nullptr,
-        CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL,
-        nullptr)));
-#endif
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -503,14 +512,14 @@ HRESULT DirectX::SaveToEXRFile(const Image& image, const wchar_t* szFile)
 
     try
     {
-        const int width = static_cast<int>(image.width);
-        const int height = static_cast<int>(image.height);
+        const auto width = static_cast<int>(image.width);
+        const auto height = static_cast<int>(image.height);
 
-#ifdef _WIN32
+    #ifdef _WIN32
         Imf::RgbaOutputFile file(stream, Imf::Header(width, height), Imf::WRITE_RGBA);
-#else
+    #else
         Imf::RgbaOutputFile file(fileName.c_str(), Imf::Header(width, height), Imf::WRITE_RGBA);
-#endif
+    #endif
 
         if (image.format == DXGI_FORMAT_R16G16B16A16_FLOAT)
         {
@@ -519,9 +528,9 @@ HRESULT DirectX::SaveToEXRFile(const Image& image, const wchar_t* szFile)
         }
         else
         {
-            const uint64_t bytes = image.width * image.height;
+            const auto bytes = static_cast<uint64_t>(image.width) * static_cast<uint64_t>(image.height);
 
-            if (bytes > UINT32_MAX)
+            if (bytes > static_cast<uint64_t>(UINT32_MAX))
             {
                 return /* HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW) */ static_cast<HRESULT>(0x80070216L);
             }
@@ -578,9 +587,9 @@ HRESULT DirectX::SaveToEXRFile(const Image& image, const wchar_t* szFile)
 #ifdef _WIN32
     catch (const com_exception& exc)
     {
-#ifdef _DEBUG
+    #ifdef _DEBUG
         OutputDebugStringA(exc.what());
-#endif
+    #endif
         hr = exc.get_result();
     }
 #endif

Auxiliary/DirectXTexEXR.h

@@ -1,7 +1,7 @@
 //--------------------------------------------------------------------------------------
 // File: DirectXTexEXR.h
 //
-// DirectXTex Auxillary functions for using the OpenEXR library
+// DirectXTex Auxilary functions for using the OpenEXR library
 //
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
@@ -14,13 +14,15 @@
 
 namespace DirectX
 {
-    HRESULT __cdecl GetMetadataFromEXRFile(
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromEXRFile(
         _In_z_ const wchar_t* szFile,
         _Out_ TexMetadata& metadata);
 
-    HRESULT __cdecl LoadFromEXRFile(
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromEXRFile(
         _In_z_ const wchar_t* szFile,
         _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image);
 
-    HRESULT __cdecl SaveToEXRFile(_In_ const Image& image, _In_z_ const wchar_t* szFile);
+    DIRECTX_TEX_API HRESULT __cdecl SaveToEXRFile(
+        _In_ const Image& image,
+        _In_z_ const wchar_t* szFile);
 }

Auxiliary/DirectXTexJPEG.cpp

@@ -0,0 +1,425 @@
+//--------------------------------------------------------------------------------------
+// File: DirectXTexJPEG.cpp
+//
+// DirectXTex Auxilary functions for using the JPEG(https://www.ijg.org) library
+//
+// For the Windows platform, the strong recommendation is to make use of the WIC
+// functions rather than using the open source library. This module exists to support
+// Windows Subsystem on Linux.
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//--------------------------------------------------------------------------------------
+
+#include "DirectXTexP.h"
+#include "DirectXTexJPEG.h"
+
+#if __cplusplus < 201703L
+#error Requires C++17 (and /Zc:__cplusplus with MSVC)
+#endif
+
+#ifndef _BASETSD_H_
+#define _BASETSD_H_
+#endif
+
+#include <cstdio>
+#include <cstdlib>
+#include <exception>
+#include <filesystem>
+#include <stdexcept>
+#include <string>
+#include <system_error>
+#include <vector>
+
+#include <jpeglib.h>
+#include <jerror.h>
+
+
+using namespace DirectX;
+using std::filesystem::path;
+using ScopedFILE = std::unique_ptr<FILE, int(*)(FILE*)>;
+
+namespace
+{
+#ifdef _WIN32
+    ScopedFILE OpenFILE(const path& p) noexcept(false)
+    {
+        const std::wstring fpath = p.generic_wstring();
+        FILE* fp = nullptr;
+        if (auto ec = _wfopen_s(&fp, fpath.c_str(), L"rb"); ec)
+            throw std::system_error{ static_cast<int>(_doserrno), std::system_category(), "_wfopen_s" };
+        return { fp, &fclose };
+    }
+    ScopedFILE CreateFILE(const path& p) noexcept(false)
+    {
+        const std::wstring fpath = p.generic_wstring();
+        FILE* fp = nullptr;
+        if (auto ec = _wfopen_s(&fp, fpath.c_str(), L"w+b"); ec)
+            throw std::system_error{ static_cast<int>(_doserrno), std::system_category(), "_wfopen_s" };
+        return { fp, &fclose };
+    }
+#else
+    ScopedFILE OpenFILE(const path& p) noexcept(false)
+    {
+        const std::string fpath = p.generic_string();
+        FILE* fp = fopen(fpath.c_str(), "rb");
+        if (!fp)
+            throw std::system_error{ errno, std::system_category(), "fopen" };
+        return { fp, &fclose };
+    }
+    ScopedFILE CreateFILE(const path& p) noexcept(false)
+    {
+        const std::string fpath = p.generic_string();
+        FILE* fp = fopen(fpath.c_str(), "w+b");
+        if (!fp)
+            throw std::system_error{ errno, std::system_category(), "fopen" };
+        return { fp, &fclose };
+    }
+#endif
+
+    [[noreturn]] void OnJPEGError(j_common_ptr ptr)
+    {
+        char msg[JMSG_LENGTH_MAX]{};
+        // "0x89 0x50": PNG
+        // "0x52 0x49": WEBP
+        (*ptr->err->format_message)(ptr, msg);
+        jpeg_destroy(ptr);
+        throw std::runtime_error{ msg };
+    }
+
+    class JPEGDecompress final
+    {
+        jpeg_error_mgr err;
+        jpeg_decompress_struct dec;
+
+    public:
+        JPEGDecompress() : err{}, dec{}
+        {
+            jpeg_std_error(&err);
+            err.error_exit = &OnJPEGError;
+            dec.err = &err;
+            jpeg_create_decompress(&dec);
+        }
+        ~JPEGDecompress() noexcept
+        {
+            jpeg_destroy_decompress(&dec);
+        }
+
+        void UseInput(FILE* fin) noexcept
+        {
+            jpeg_stdio_src(&dec, fin);
+        }
+
+        static DXGI_FORMAT TranslateColor(J_COLOR_SPACE colorspace) noexcept
+        {
+            switch (colorspace)
+            {
+            case JCS_GRAYSCALE: // 1 component
+                return DXGI_FORMAT_R8_UNORM;
+            case JCS_RGB: // 3 component, Standard RGB
+                return DXGI_FORMAT_R8G8B8A8_UNORM;
+            case JCS_CMYK: // 4 component. WIC retuns this for CMYK
+                return DXGI_FORMAT_R8G8B8A8_UNORM;
+            #ifdef LIBJPEG_TURBO_VERSION
+            case JCS_EXT_RGBX: // 4 component
+            case JCS_EXT_RGBA:
+                return DXGI_FORMAT_R8G8B8A8_UNORM;
+            case JCS_RGB565:
+                return DXGI_FORMAT_B5G6R5_UNORM;
+            #endif
+            case JCS_YCbCr: // 3 component, YCbCr
+            default:
+                return DXGI_FORMAT_UNKNOWN;
+            }
+        }
+
+        void GetMetadata(TexMetadata& metadata) noexcept(false)
+        {
+            metadata.width = dec.image_width;
+            metadata.height = dec.image_height;
+            metadata.depth = 1;
+            metadata.arraySize = 1;
+            metadata.mipLevels = 1;
+            metadata.dimension = TEX_DIMENSION_TEXTURE2D;
+            metadata.format = TranslateColor(dec.out_color_space);
+            if (metadata.format == DXGI_FORMAT_UNKNOWN)
+            {
+                throw std::runtime_error{ "unexpected out_color_space in jpeg_decompress_struct" };
+            }
+            if (metadata.format == DXGI_FORMAT_R8G8B8A8_UNORM)
+            {
+                metadata.miscFlags2 |= TEX_ALPHA_MODE_OPAQUE;
+            }
+        }
+
+        HRESULT GetHeader(TexMetadata& metadata) noexcept(false)
+        {
+            metadata = {};
+            switch (jpeg_read_header(&dec, false))
+            {
+            case JPEG_HEADER_TABLES_ONLY:
+                [[fallthrough]];
+            case JPEG_HEADER_OK:
+                break;
+            case JPEG_SUSPENDED:
+                return E_FAIL;
+            }
+            GetMetadata(metadata);
+            return S_OK;
+        }
+
+    #if !defined(LIBJPEG_TURBO_VERSION)
+        // shift pixels with padding in reverse order (to make it work in-memory)
+        void ShiftPixels(ScratchImage& image) noexcept
+        {
+            size_t num_pixels = dec.output_width * dec.output_height;
+            uint8_t* dst = image.GetPixels();
+            const uint8_t* src = dst;
+            for (size_t i = num_pixels - 1; i > 0; i -= 1)
+            {
+                dst[4*i + 0] = src[3*i + 0];
+                dst[4*i + 1] = src[3*i + 1];
+                dst[4*i + 2] = src[3*i + 2];
+                dst[4*i + 3] = 0;
+            }
+        }
+    #endif
+
+        HRESULT GetImage(TexMetadata& metadata, ScratchImage& image) noexcept(false)
+        {
+            metadata = {};
+            switch (jpeg_read_header(&dec, true))
+            {
+            case JPEG_HEADER_TABLES_ONLY:
+                GetMetadata(metadata);
+                [[fallthrough]];
+            case JPEG_SUSPENDED:
+                return E_FAIL;
+            case JPEG_HEADER_OK:
+                break;
+            }
+            GetMetadata(metadata);
+            // if the JPEG library doesn't have color space conversion, it should be ERROR_NOT_SUPPORTED
+            if (dec.jpeg_color_space == JCS_YCCK)
+            {
+                // CMYK is the known case
+                if (dec.out_color_space == JCS_CMYK)
+                    return HRESULT_E_NOT_SUPPORTED;
+            }
+
+            if (auto hr = image.Initialize2D(metadata.format, metadata.width, metadata.height, metadata.arraySize, metadata.mipLevels); FAILED(hr))
+                return hr;
+
+        #ifdef LIBJPEG_TURBO_VERSION
+            // grayscale is the only color space which uses 1 component
+            if (dec.out_color_space != JCS_GRAYSCALE)
+                // if there is no proper conversion to 4 component, E_FAIL...
+                dec.out_color_space = JCS_EXT_RGBX;
+        #endif
+            if (jpeg_start_decompress(&dec) == false)
+                return E_FAIL;
+
+            uint8_t* dest = image.GetPixels();
+            const size_t stride = dec.output_width * static_cast<size_t>(dec.output_components);
+            std::vector<JSAMPROW> rows(dec.output_height);
+            for (size_t i = 0u; i < dec.output_height; ++i)
+                rows[i] = dest + (stride * i);
+
+            JDIMENSION leftover = dec.output_height;
+            while (leftover > 0)
+            {
+                JDIMENSION consumed = jpeg_read_scanlines(&dec, &rows[dec.output_scanline], leftover);
+                leftover -= consumed;
+            }
+            if (jpeg_finish_decompress(&dec) == false)
+                return E_FAIL;
+
+        #if !defined(LIBJPEG_TURBO_VERSION)
+            // if NOT TurboJPEG, we need to make 3 component images to 4 component image
+            if (dec.out_color_space != JCS_GRAYSCALE)
+                ShiftPixels(image);
+        #endif
+            return S_OK;
+        }
+
+        HRESULT GetImage(ScratchImage& image) noexcept(false)
+        {
+            TexMetadata metadata{};
+            return GetImage(metadata, image);
+        }
+    };
+
+    class JPEGCompress final
+    {
+        jpeg_error_mgr err{};
+        jpeg_compress_struct enc{};
+
+    public:
+        JPEGCompress() : err{}, enc{}
+        {
+            jpeg_std_error(&err);
+            err.error_exit = &OnJPEGError;
+            enc.err = &err;
+            jpeg_create_compress(&enc);
+        }
+        ~JPEGCompress() noexcept
+        {
+            jpeg_destroy_compress(&enc);
+        }
+
+        void UseOutput(FILE* fout)
+        {
+            jpeg_stdio_dest(&enc, fout);
+        }
+
+        /// @todo More correct DXGI_FORMAT mapping
+        HRESULT WriteImage(const Image& image) noexcept(false)
+        {
+            switch (image.format)
+            {
+            case DXGI_FORMAT_R8_UNORM:
+                enc.input_components = 1;
+                enc.in_color_space = JCS_GRAYSCALE;
+                break;
+            #ifdef LIBJPEG_TURBO_VERSION
+            case DXGI_FORMAT_R8G8B8A8_UNORM:
+                enc.input_components = 4;
+                enc.in_color_space = JCS_EXT_RGBA;
+                break;
+            case DXGI_FORMAT_B8G8R8A8_UNORM:
+                enc.input_components = 4;
+                enc.in_color_space = JCS_EXT_BGRA;
+                break;
+            #else
+            case DXGI_FORMAT_R8G8B8A8_UNORM:
+                enc.input_components = 3;
+                enc.in_color_space = JCS_RGB;
+            #endif
+
+            default:
+                return HRESULT_E_NOT_SUPPORTED;
+            }
+            enc.image_width = static_cast<JDIMENSION>(image.width);
+            enc.image_height = static_cast<JDIMENSION>(image.height);
+            jpeg_set_defaults(&enc);
+            jpeg_set_quality(&enc, 100, true);
+            // we will write a row each time ...
+            jpeg_start_compress(&enc, true);
+            const size_t stride = enc.image_width * static_cast<size_t>(enc.input_components);
+            while (enc.next_scanline < enc.image_height)
+            {
+                JSAMPROW rows[1]{ image.pixels + stride * enc.next_scanline };
+                jpeg_write_scanlines(&enc, rows, 1);
+            }
+            jpeg_finish_compress(&enc);
+            return S_OK;
+        }
+    };
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::GetMetadataFromJPEGFile(
+    const wchar_t* file,
+    TexMetadata& metadata)
+{
+    if (!file)
+        return E_INVALIDARG;
+
+    try
+    {
+        auto fin = OpenFILE(file);
+        JPEGDecompress decoder{};
+        decoder.UseInput(fin.get());
+        return decoder.GetHeader(metadata);
+    }
+    catch (const std::bad_alloc&)
+    {
+        return E_OUTOFMEMORY;
+    }
+    catch (const std::system_error& ec)
+    {
+    #ifdef _WIN32
+        return HRESULT_FROM_WIN32(static_cast<unsigned long>(ec.code().value()));
+    #else
+        return (ec.code().value() == ENOENT) ? HRESULT_ERROR_FILE_NOT_FOUND : E_FAIL;
+    #endif
+    }
+    catch (const std::exception&)
+    {
+        return E_FAIL;
+    }
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::LoadFromJPEGFile(
+    const wchar_t* file,
+    TexMetadata* metadata,
+    ScratchImage&image)
+{
+    if (!file)
+        return E_INVALIDARG;
+
+    image.Release();
+
+    try
+    {
+        auto fin = OpenFILE(file);
+        JPEGDecompress decoder{};
+        decoder.UseInput(fin.get());
+        if (!metadata)
+            return decoder.GetImage(image);
+        return decoder.GetImage(*metadata, image);
+    }
+    catch (const std::bad_alloc&)
+    {
+        image.Release();
+        return E_OUTOFMEMORY;
+    }
+    catch (const std::system_error& ec)
+    {
+        image.Release();
+    #ifdef _WIN32
+        return HRESULT_FROM_WIN32(static_cast<unsigned long>(ec.code().value()));
+    #else
+        return (ec.code().value() == ENOENT) ? HRESULT_ERROR_FILE_NOT_FOUND : E_FAIL;
+    #endif
+    }
+    catch (const std::exception&)
+    {
+        image.Release();
+        return E_FAIL;
+    }
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::SaveToJPEGFile(
+    const Image& image,
+    const wchar_t* file)
+{
+    if (!file)
+        return E_INVALIDARG;
+
+    try
+    {
+        auto fout = CreateFILE(file);
+        JPEGCompress encoder{};
+        encoder.UseOutput(fout.get());
+        return encoder.WriteImage(image);
+    }
+    catch (const std::bad_alloc&)
+    {
+        return E_OUTOFMEMORY;
+    }
+    catch (const std::system_error& ec)
+    {
+    #ifdef _WIN32
+        return HRESULT_FROM_WIN32(static_cast<unsigned long>(ec.code().value()));
+    #else
+        return (ec.code().value() == ENOENT) ? HRESULT_ERROR_FILE_NOT_FOUND : E_FAIL;
+    #endif
+    }
+    catch (const std::exception&)
+    {
+        return E_FAIL;
+    }
+}

Auxiliary/DirectXTexJPEG.h

@@ -0,0 +1,33 @@
+//--------------------------------------------------------------------------------------
+// File: DirectXTexJPEG.h
+//
+// DirectXTex Auxilary functions for using the JPEG(https://www.ijg.org) library
+//
+// For the Windows platform, the strong recommendation is to make use of the WIC
+// functions rather than using the open source library. This module exists to support
+// Windows Subsystem on Linux.
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#include "DirectXTex.h"
+
+
+namespace DirectX
+{
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromJPEGFile(
+        _In_z_ const wchar_t* szFile,
+        _Out_ TexMetadata& metadata);
+
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromJPEGFile(
+        _In_z_ const wchar_t* szFile,
+        _Out_opt_ TexMetadata* metadata,
+        _Out_ ScratchImage& image);
+
+    DIRECTX_TEX_API HRESULT __cdecl SaveToJPEGFile(
+        _In_ const Image& image,
+        _In_z_ const wchar_t* szFile);
+}

Auxiliary/DirectXTexPNG.cpp

@@ -0,0 +1,430 @@
+//--------------------------------------------------------------------------------------
+// File: DirectXTexPNG.cpp
+//
+// DirectXTex Auxilary functions for using the PNG(http://www.libpng.org/pub/png/libpng.html) library
+//
+// For the Windows platform, the strong recommendation is to make use of the WIC
+// functions rather than using the open source library. This module exists to support
+// Windows Subsystem on Linux.
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//--------------------------------------------------------------------------------------
+
+#include "DirectXTexP.h"
+#include "DirectXTexPNG.h"
+
+#if __cplusplus < 201703L
+#error Requires C++17 (and /Zc:__cplusplus with MSVC)
+#endif
+
+#include <cstdio>
+#include <cstdlib>
+#include <exception>
+#include <filesystem>
+#include <stdexcept>
+#include <string>
+#include <system_error>
+#include <vector>
+
+#include <png.h>
+
+
+using namespace DirectX;
+using std::filesystem::path;
+using ScopedFILE = std::unique_ptr<FILE, int(*)(FILE*)>;
+
+namespace
+{
+#ifdef _WIN32
+    ScopedFILE OpenFILE(const path& p) noexcept(false)
+    {
+        const std::wstring fpath = p.generic_wstring();
+        FILE* fp = nullptr;
+        if (auto ec = _wfopen_s(&fp, fpath.c_str(), L"rb"); ec)
+            throw std::system_error{ static_cast<int>(_doserrno), std::system_category(), "_wfopen_s" };
+        return { fp, &fclose };
+    }
+    ScopedFILE CreateFILE(const path& p) noexcept(false)
+    {
+        const std::wstring fpath = p.generic_wstring();
+        FILE* fp = nullptr;
+        if (auto ec = _wfopen_s(&fp, fpath.c_str(), L"w+b"); ec)
+            throw std::system_error{ static_cast<int>(_doserrno), std::system_category(), "_wfopen_s" };
+        return { fp, &fclose };
+    }
+#else
+    ScopedFILE OpenFILE(const path& p) noexcept(false)
+    {
+        const std::string fpath = p.generic_string();
+        FILE* fp = fopen(fpath.c_str(), "rb");
+        if (!fp)
+            throw std::system_error{ errno, std::system_category(), "fopen" };
+        return { fp, &fclose };
+    }
+    ScopedFILE CreateFILE(const path& p) noexcept(false)
+    {
+        const std::string fpath = p.generic_string();
+        FILE* fp = fopen(fpath.c_str(), "w+b");
+        if (!fp)
+            throw std::system_error{ errno, std::system_category(), "fopen" };
+        return { fp, &fclose };
+    }
+#endif
+
+    [[noreturn]] void OnPNGError(png_structp, png_const_charp msg)
+    {
+        throw std::runtime_error{ msg };
+    }
+
+    void OnPNGWarning(png_structp, png_const_charp)
+    {
+        // drain warning messages ...
+    }
+
+    /// @note If the PNG contains some extra chunks like EXIF, this will be used
+    void OnPNGRead(png_structp st, png_bytep ptr, size_t len)
+    {
+        FILE* fin = reinterpret_cast<FILE*>(png_get_io_ptr(st));
+        std::ignore = fread(ptr, len, 1, fin);
+    }
+
+
+    /// @see http://www.libpng.org/pub/png/libpng.html
+    /// @see http://www.libpng.org/pub/png/libpng-manual.txt
+    class PNGDecompress final
+    {
+        png_structp st;
+        png_infop info;
+
+    public:
+        PNGDecompress() noexcept(false) : st{ nullptr }, info{ nullptr }
+        {
+            st = png_create_read_struct(PNG_LIBPNG_VER_STRING, this, &OnPNGError, &OnPNGWarning);
+            if (!st)
+                throw std::runtime_error{ "png_create_read_struct" };
+            info = png_create_info_struct(st);
+            if (!info)
+            {
+                png_destroy_read_struct(&st, nullptr, nullptr);
+                throw std::runtime_error{ "png_create_info_struct" };
+            }
+        }
+
+        ~PNGDecompress() noexcept
+        {
+            png_destroy_read_struct(&st, &info, nullptr);
+        }
+
+        void UseInput(FILE* fin) noexcept
+        {
+            // we assume the signature is unread. if so, we have to use `png_set_sig_bytes`
+            png_init_io(st, fin);
+            png_set_read_fn(st, fin, &OnPNGRead);
+        }
+
+        void Update() noexcept(false)
+        {
+            png_read_info(st, info);
+            // check for unsupported cases
+            png_byte interlacing = png_get_interlace_type(st, info);
+            if (interlacing != PNG_INTERLACE_NONE)
+            {
+                throw std::invalid_argument{ "interlacing not supported" };
+            }
+            // color handling
+            png_byte color_type = png_get_color_type(st, info);
+            if (color_type == PNG_COLOR_TYPE_GRAY)
+            {
+                // bit_depth will be 8 or 16
+                if (png_get_bit_depth(st, info) < 8)
+                    png_set_expand_gray_1_2_4_to_8(st);
+            }
+            else if (color_type == PNG_COLOR_TYPE_PALETTE)
+            {
+                // request RGB color
+                png_set_palette_to_rgb(st);
+                if (png_get_valid(st, info, PNG_INFO_tRNS))
+                    png_set_tRNS_to_alpha(st);
+            }
+            // Here we don't know if the pixel data is in BGR/RGB order
+            // png_set_bgr(st);
+            png_set_alpha_mode(st, PNG_ALPHA_STANDARD, PNG_DEFAULT_sRGB);
+            // make 4 component
+            // using `png_set_add_alpha` here may confuse `TEX_ALPHA_MODE_OPAQUE` estimation
+            if (png_get_channels(st, info) == 3)
+                png_set_filler(st, 0, PNG_FILLER_AFTER);
+            // prefer DXGI_FORMAT_R8G8B8A8_UNORM. strip in decode
+            //if (png_get_bit_depth(st, info) > 8)
+            //    png_set_strip_16(st);
+            png_read_update_info(st, info);
+        }
+
+        /// @note must call `Update` before this
+        /// @todo Proper detection of DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM_SRGB
+        DXGI_FORMAT GuessFormat() const noexcept(false)
+        {
+            // 1 or 4. 1 is for gray
+            auto c = png_get_channels(st, info);
+            if (c == 1)
+            {
+                if (png_get_bit_depth(st, info) == 16)
+                    return DXGI_FORMAT_R16_UNORM;
+                // with `png_set_expand_gray_1_2_4_to_8`, libpng will change to R8_UNORM
+                return DXGI_FORMAT_R8_UNORM;
+            }
+
+            // 8 or 16. expanded if 1, 2, 4
+            auto d = png_get_bit_depth(st, info);
+            if (d == 16)
+                return DXGI_FORMAT_R16G16B16A16_UNORM;
+            if (d != 8)
+                throw std::runtime_error{ "unexpected info from libpng" };
+
+            int intent = 0;
+            if (png_get_sRGB(st, info, &intent) == PNG_INFO_sRGB)
+                return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
+
+            return DXGI_FORMAT_R8G8B8A8_UNORM;
+        }
+
+        /// @todo More correct DXGI_FORMAT mapping
+        void GetHeader(TexMetadata& metadata) noexcept(false)
+        {
+            metadata = {};
+            metadata.width = png_get_image_width(st, info);
+            metadata.height = png_get_image_height(st, info);
+            metadata.arraySize = 1;
+            metadata.mipLevels = 1;
+            metadata.depth = 1;
+            metadata.dimension = TEX_DIMENSION_TEXTURE2D;
+            metadata.format = GuessFormat();
+            png_byte color_type = png_get_color_type(st, info);
+            bool have_alpha = (color_type & PNG_COLOR_MASK_ALPHA);
+            if (have_alpha == false && (metadata.format != DXGI_FORMAT_R8_UNORM))
+                metadata.miscFlags2 |= TEX_ALPHA_MODE_OPAQUE;
+        }
+
+        /// @todo More correct DXGI_FORMAT mapping
+        HRESULT GetImage(TexMetadata& metadata, ScratchImage& image) noexcept(false)
+        {
+            metadata = {};
+            GetHeader(metadata);
+
+            if (auto hr = image.Initialize2D(metadata.format, metadata.width, metadata.height, metadata.arraySize, metadata.mipLevels); FAILED(hr))
+                return hr;
+            auto* dest = image.GetPixels();
+            const auto stride = metadata.width * png_get_channels(st, info);
+            std::vector<png_byte*> rows(metadata.height);
+            for (auto i = 0u; i < metadata.height; ++i)
+                rows[i] = dest + (stride * i);
+
+            png_read_rows(st, rows.data(), nullptr, static_cast<uint32_t>(rows.size()));
+            png_read_end(st, info);
+            return S_OK;
+        }
+
+        HRESULT GetImage(ScratchImage& image) noexcept(false)
+        {
+            TexMetadata metadata{};
+            return GetImage(metadata, image);
+        }
+    };
+
+    /// @see http://www.libpng.org/pub/png/libpng.html
+    /// @see http://www.libpng.org/pub/png/libpng-manual.txt
+    class PNGCompress final
+    {
+        png_structp st;
+        png_infop info;
+
+    public:
+        PNGCompress() noexcept(false) : st{ nullptr }, info{ nullptr }
+        {
+            st = png_create_write_struct(PNG_LIBPNG_VER_STRING, this, &OnPNGError, &OnPNGWarning);
+            if (!st)
+                throw std::runtime_error{ "png_create_write_struct" };
+            info = png_create_info_struct(st);
+            if (!info)
+            {
+                png_destroy_write_struct(&st, nullptr);
+                throw std::runtime_error{ "png_create_info_struct" };
+            }
+            png_set_compression_level(st, 0);
+        }
+
+        ~PNGCompress() noexcept
+        {
+            png_destroy_write_struct(&st, &info);
+        }
+
+        void UseOutput(FILE* fout) noexcept
+        {
+            png_init_io(st, fout);
+        }
+
+        HRESULT WriteImage(const Image& image) noexcept(false)
+        {
+            int color_type = PNG_COLOR_TYPE_RGB;
+            bool using_bgr = false;
+            int channel = 4;
+            int bit_depth = 8;
+            switch (image.format)
+            {
+            case DXGI_FORMAT_R8_UNORM:
+                color_type = PNG_COLOR_TYPE_GRAY;
+                channel = 1;
+                break;
+            case DXGI_FORMAT_B8G8R8A8_UNORM:
+            case DXGI_FORMAT_B8G8R8X8_UNORM:
+                using_bgr = true;
+                [[fallthrough]];
+            case DXGI_FORMAT_R8G8B8A8_UNORM:
+                color_type = PNG_COLOR_TYPE_RGBA;
+                break;
+            default:
+                return HRESULT_E_NOT_SUPPORTED;
+            }
+
+            png_set_IHDR(st, info,
+                static_cast<uint32_t>(image.width),
+                static_cast<uint32_t>(image.height),
+                bit_depth,
+                color_type,
+                PNG_INTERLACE_NONE,
+                PNG_COMPRESSION_TYPE_DEFAULT,
+                PNG_FILTER_TYPE_DEFAULT);
+            png_write_info(st, info);
+            if (using_bgr)
+                png_set_bgr(st);
+
+            const size_t stride = static_cast<size_t>(channel) * image.width;
+            std::vector<png_bytep> rows(image.height);
+            for (size_t i = 0u; i< image.height; ++i)
+                rows[i] = image.pixels + stride * i;
+            png_write_rows(st, rows.data(), static_cast<uint32_t>(rows.size()));
+
+            // actual write will be done here
+            png_write_end(st, info);
+            return S_OK;
+        }
+    };
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::GetMetadataFromPNGFile(
+    const wchar_t* file,
+    TexMetadata& metadata)
+{
+    if (!file)
+        return E_INVALIDARG;
+
+    try
+    {
+        auto fin = OpenFILE(file);
+        PNGDecompress decoder{};
+        decoder.UseInput(fin.get());
+        decoder.Update();
+        decoder.GetHeader(metadata);
+        return S_OK;
+    }
+    catch (const std::bad_alloc&)
+    {
+        return E_OUTOFMEMORY;
+    }
+    catch (const std::system_error& ec)
+    {
+    #ifdef _WIN32
+        return HRESULT_FROM_WIN32(static_cast<unsigned long>(ec.code().value()));
+    #else
+        return (ec.code().value() == ENOENT) ? HRESULT_ERROR_FILE_NOT_FOUND : E_FAIL;
+    #endif
+    }
+    catch (const std::invalid_argument&)
+    {
+        return HRESULT_E_NOT_SUPPORTED;
+    }
+    catch (const std::exception&)
+    {
+        return E_FAIL;
+    }
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::LoadFromPNGFile(
+    const wchar_t* file,
+    TexMetadata* metadata,
+    ScratchImage& image)
+{
+    if (!file)
+        return E_INVALIDARG;
+
+    image.Release();
+
+    try
+    {
+        auto fin = OpenFILE(file);
+        PNGDecompress decoder{};
+        decoder.UseInput(fin.get());
+        decoder.Update();
+        if (metadata == nullptr)
+            return decoder.GetImage(image);
+        return decoder.GetImage(*metadata, image);
+    }
+    catch (const std::bad_alloc&)
+    {
+        image.Release();
+        return E_OUTOFMEMORY;
+    }
+    catch (const std::system_error& ec)
+    {
+        image.Release();
+    #ifdef _WIN32
+        return HRESULT_FROM_WIN32(static_cast<unsigned long>(ec.code().value()));
+    #else
+        return (ec.code().value() == ENOENT) ? HRESULT_ERROR_FILE_NOT_FOUND : E_FAIL;
+    #endif
+    }
+    catch (const std::invalid_argument&)
+    {
+        return HRESULT_E_NOT_SUPPORTED;
+    }
+    catch (const std::exception&)
+    {
+        image.Release();
+        return E_FAIL;
+    }
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::SaveToPNGFile(
+    const Image& image,
+    const wchar_t* file)
+{
+    if (!file)
+        return E_INVALIDARG;
+
+    try
+    {
+        auto fout = CreateFILE(file);
+        PNGCompress encoder{};
+        encoder.UseOutput(fout.get());
+        return encoder.WriteImage(image);
+    }
+    catch (const std::bad_alloc&)
+    {
+        return E_OUTOFMEMORY;
+    }
+    catch (const std::system_error& ec)
+    {
+    #ifdef _WIN32
+        return HRESULT_FROM_WIN32(static_cast<unsigned long>(ec.code().value()));
+    #else
+        return (ec.code().value() == ENOENT) ? HRESULT_ERROR_FILE_NOT_FOUND : E_FAIL;
+    #endif
+    }
+    catch (const std::exception&)
+    {
+        return E_FAIL;
+    }
+}

Auxiliary/DirectXTexPNG.h

@@ -0,0 +1,33 @@
+//--------------------------------------------------------------------------------------
+// File: DirectXTexPNG.h
+//
+// DirectXTex Auxilary functions for using the PNG(http://www.libpng.org/pub/png/libpng.html) library
+//
+// For the Windows platform, the strong recommendation is to make use of the WIC
+// functions rather than using the open source library. This module exists to support
+// Windows Subsystem on Linux.
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#include "DirectXTex.h"
+
+
+namespace DirectX
+{
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromPNGFile(
+        _In_z_ const wchar_t* szFile,
+        _Out_ TexMetadata& metadata);
+
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromPNGFile(
+        _In_z_ const wchar_t* szFile,
+        _Out_opt_ TexMetadata* metadata,
+        _Out_ ScratchImage& image);
+
+    DIRECTX_TEX_API HRESULT __cdecl SaveToPNGFile(
+        _In_ const Image& image,
+        _In_z_ const wchar_t* szFile);
+}

Auxiliary/DirectXTexXbox.h

@@ -1,7 +1,7 @@
 //--------------------------------------------------------------------------------------
 // File: DirectXTexXbox.h
 //
-// DirectXTex Auxillary functions for Xbox texture processing
+// DirectXTex Auxilary functions for Xbox texture processing
 //
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
@@ -41,6 +41,9 @@
 #include <d3d11_1.h>
 #endif
 
+#include <cstdint>
+#include <utility>
+
 #define DIRECTX_TEX_XBOX_VERSION 150
 
 namespace Xbox
@@ -55,13 +58,17 @@ namespace Xbox
     constexpr XboxTileMode c_XboxTileModeLinear = XG_TILE_MODE_LINEAR;
 #endif
 
-    class XboxImage
+    class DIRECTX_TEX_API XboxImage
     {
     public:
         XboxImage() noexcept
-            : dataSize(0), baseAlignment(0), tilemode(c_XboxTileModeInvalid), metadata{}, memory(nullptr) {}
+            : dataSize(0), baseAlignment(0), tilemode(c_XboxTileModeInvalid), metadata{}, memory(nullptr)
+        {}
         XboxImage(XboxImage&& moveFrom) noexcept
-            : dataSize(0), baseAlignment(0), tilemode(c_XboxTileModeInvalid), metadata{}, memory(nullptr) { *this = std::move(moveFrom); }
+            : dataSize(0), baseAlignment(0), tilemode(c_XboxTileModeInvalid), metadata{}, memory(nullptr)
+        {
+            *this = std::move(moveFrom);
+        }
         ~XboxImage() { Release(); }
 
         XboxImage& __cdecl operator= (XboxImage&& moveFrom) noexcept;
@@ -69,12 +76,12 @@ namespace Xbox
         XboxImage(const XboxImage&) = delete;
         XboxImage& operator=(const XboxImage&) = delete;
 
-        HRESULT Initialize(_In_ const XG_TEXTURE1D_DESC& desc, _In_ const XG_RESOURCE_LAYOUT& layout, _In_ uint32_t miscFlags2 = 0);
-        HRESULT Initialize(_In_ const XG_TEXTURE2D_DESC& desc, _In_ const XG_RESOURCE_LAYOUT& layout, _In_ uint32_t miscFlags2 = 0);
-        HRESULT Initialize(_In_ const XG_TEXTURE3D_DESC& desc, _In_ const XG_RESOURCE_LAYOUT& layout, _In_ uint32_t miscFlags2 = 0);
-        HRESULT Initialize(_In_ const DirectX::TexMetadata& mdata, _In_ XboxTileMode tm, _In_ uint32_t size, _In_ uint32_t alignment);
+        HRESULT __cdecl Initialize(_In_ const XG_TEXTURE1D_DESC& desc, _In_ const XG_RESOURCE_LAYOUT& layout, _In_ uint32_t miscFlags2 = 0);
+        HRESULT __cdecl Initialize(_In_ const XG_TEXTURE2D_DESC& desc, _In_ const XG_RESOURCE_LAYOUT& layout, _In_ uint32_t miscFlags2 = 0);
+        HRESULT __cdecl Initialize(_In_ const XG_TEXTURE3D_DESC& desc, _In_ const XG_RESOURCE_LAYOUT& layout, _In_ uint32_t miscFlags2 = 0);
+        HRESULT __cdecl Initialize(_In_ const DirectX::TexMetadata& mdata, _In_ XboxTileMode tm, _In_ uint32_t size, _In_ uint32_t alignment);
 
-        void Release();
+        void __cdecl Release();
 
         const DirectX::TexMetadata& GetMetadata() const { return metadata; }
         XboxTileMode GetTileMode() const { return tilemode; }
@@ -94,65 +101,98 @@ namespace Xbox
     //---------------------------------------------------------------------------------
     // Image I/O
 
-    HRESULT GetMetadataFromDDSMemory(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSMemory(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _Out_ DirectX::TexMetadata& metadata, _Out_ bool& isXbox);
-    HRESULT GetMetadataFromDDSFile(
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSFile(
         _In_z_ const wchar_t* szFile, _Out_ DirectX::TexMetadata& metadata, _Out_ bool& isXbox);
 
-    HRESULT GetMetadataFromDDSMemoryEx(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSMemoryEx(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _Out_ DirectX::TexMetadata& metadata, _Out_ bool& isXbox,
         _Out_opt_ DirectX::DDSMetaData* ddPixelFormat);
-    HRESULT GetMetadataFromDDSFileEx(
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSFileEx(
         _In_z_ const wchar_t* szFile, _Out_ DirectX::TexMetadata& metadata, _Out_ bool& isXbox,
         _Out_opt_ DirectX::DDSMetaData* ddPixelFormat);
 
-    HRESULT LoadFromDDSMemory(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSMemory(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _Out_opt_ DirectX::TexMetadata* metadata, _Out_ XboxImage& image);
-    HRESULT LoadFromDDSFile(
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSFile(
         _In_z_ const wchar_t* szFile,
         _Out_opt_ DirectX::TexMetadata* metadata, _Out_ XboxImage& image);
 
-    HRESULT LoadFromDDSMemoryEx(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSMemoryEx(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _Out_opt_ DirectX::TexMetadata* metadata,
         _Out_opt_ DirectX::DDSMetaData* ddPixelFormat,
         _Out_ XboxImage& image);
-    HRESULT LoadFromDDSFileEx(
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSFileEx(
         _In_z_ const wchar_t* szFile,
         _Out_opt_ DirectX::TexMetadata* metadata,
         _Out_opt_ DirectX::DDSMetaData* ddPixelFormat,
         _Out_ XboxImage& image);
 
-    HRESULT SaveToDDSMemory(_In_ const XboxImage& xbox, _Out_ DirectX::Blob& blob);
-    HRESULT SaveToDDSFile(_In_ const XboxImage& xbox, _In_z_ const wchar_t* szFile);
+    DIRECTX_TEX_API HRESULT __cdecl SaveToDDSMemory(_In_ const XboxImage& xbox, _Out_ DirectX::Blob& blob);
+    DIRECTX_TEX_API HRESULT __cdecl SaveToDDSFile(_In_ const XboxImage& xbox, _In_z_ const wchar_t* szFile);
+
+#ifdef __cpp_lib_byte
+    inline HRESULT __cdecl GetMetadataFromDDSMemory(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _Out_ DirectX::TexMetadata& metadata, _Out_ bool& isXbox)
+    {
+        return GetMetadataFromDDSMemory(reinterpret_cast<const uint8_t*>(pSource), size, metadata, isXbox);
+    }
+
+    inline HRESULT __cdecl GetMetadataFromDDSMemoryEx(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _Out_ DirectX::TexMetadata& metadata, _Out_ bool& isXbox,
+        _Out_opt_ DirectX::DDSMetaData* ddPixelFormat)
+    {
+        return GetMetadataFromDDSMemoryEx(reinterpret_cast<const uint8_t*>(pSource), size, metadata, isXbox, ddPixelFormat);
+    }
+
+    inline HRESULT __cdecl LoadFromDDSMemory(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _Out_opt_ DirectX::TexMetadata* metadata, _Out_ XboxImage& image)
+    {
+        return LoadFromDDSMemory(reinterpret_cast<const uint8_t*>(pSource), size, metadata, image);
+    }
+
+    inline HRESULT __cdecl LoadFromDDSMemoryEx(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _Out_opt_ DirectX::TexMetadata* metadata,
+        _Out_opt_ DirectX::DDSMetaData* ddPixelFormat,
+        _Out_ XboxImage& image)
+    {
+        return LoadFromDDSMemoryEx(reinterpret_cast<const uint8_t*>(pSource), size, metadata, ddPixelFormat, image);
+    }
+#endif // __cpp_lib_byte
 
     //---------------------------------------------------------------------------------
     // Xbox Texture Tiling / Detiling (requires XG DLL to be present at runtime)
 
-    HRESULT Tile(_In_ const DirectX::Image& srcImage, _Out_ XboxImage& xbox, _In_ XboxTileMode mode = c_XboxTileModeInvalid);
-    HRESULT Tile(
+    DIRECTX_TEX_API HRESULT __cdecl Tile(_In_ const DirectX::Image& srcImage, _Out_ XboxImage& xbox, _In_ XboxTileMode mode = c_XboxTileModeInvalid);
+    DIRECTX_TEX_API HRESULT __cdecl Tile(
         _In_ const DirectX::Image* srcImages, _In_ size_t nimages, _In_ const DirectX::TexMetadata& metadata,
         _Out_ XboxImage& xbox, _In_ XboxTileMode mode = c_XboxTileModeInvalid);
 
-    HRESULT Detile(_In_ const XboxImage& xbox, _Out_ DirectX::ScratchImage& image);
+    DIRECTX_TEX_API HRESULT __cdecl Detile(_In_ const XboxImage& xbox, _Out_ DirectX::ScratchImage& image);
 
     //---------------------------------------------------------------------------------
     // Direct3D 11.X functions
 
 #if defined(_XBOX_ONE) && defined(_TITLE) && defined(__d3d11_x_h__)
 
-    HRESULT CreateTexture(
+    DIRECTX_TEX_API HRESULT __cdecl CreateTexture(
         _In_ ID3D11DeviceX* d3dDevice,
         _In_ const XboxImage& xbox, _Outptr_opt_ ID3D11Resource** ppResource, _Outptr_ void** grfxMemory);
 
-    HRESULT CreateShaderResourceView(
+    DIRECTX_TEX_API HRESULT __cdecl CreateShaderResourceView(
         _In_ ID3D11DeviceX* d3dDevice,
         _In_ const XboxImage& xbox, _Outptr_opt_ ID3D11ShaderResourceView** ppSRV, _Outptr_ void** grfxMemory);
 
-    void FreeTextureMemory(_In_ ID3D11DeviceX* d3dDevice, _In_opt_ void* grfxMemory);
+    DIRECTX_TEX_API void __cdecl FreeTextureMemory(_In_ ID3D11DeviceX* d3dDevice, _In_opt_ void* grfxMemory);
 
 #endif
 
@@ -161,12 +201,27 @@ namespace Xbox
 
 #if ((defined(_XBOX_ONE) && defined(_TITLE)) || defined(_GAMING_XBOX)) && (defined(__d3d12_x_h__) || defined(__XBOX_D3D12_X__))
 
-    HRESULT CreateTexture(
+    DIRECTX_TEX_API HRESULT __cdecl CreateTexture(
         _In_ ID3D12Device* d3dDevice,
         _In_ const XboxImage& xbox, _Outptr_opt_ ID3D12Resource** ppResource, _Outptr_ void** grfxMemory);
 
-    void FreeTextureMemory(_In_ ID3D12Device* d3dDevice, _In_opt_ void* grfxMemory);
+    DIRECTX_TEX_API void __cdecl FreeTextureMemory(_In_ ID3D12Device* d3dDevice, _In_opt_ void* grfxMemory);
 
 #endif
 
+    //---------------------------------------------------------------------------------
+    // DDS helper functions
+    DIRECTX_TEX_API HRESULT __cdecl EncodeDDSHeader(
+        const XboxImage& xbox,
+        _Out_writes_bytes_(maxsize) uint8_t* pDestination, _In_ size_t maxsize) noexcept;
+
+#ifdef __cpp_lib_byte
+    inline HRESULT __cdecl EncodeDDSHeader(
+        const XboxImage& xbox,
+        _Out_writes_bytes_(maxsize) std::byte* pDestination, _In_ size_t maxsize) noexcept
+    {
+        return EncodeDDSHeader(xbox, reinterpret_cast<uint8_t*>(pDestination), maxsize);
+    }
+#endif
+
 } // namespace

Auxiliary/DirectXTexXboxD3D11X.cpp

@@ -1,7 +1,7 @@
 //-------------------------------------------------------------------------------------
 // DirectXTexD3D11X.cpp
 //
-// DirectXTex Auxillary functions for creating resouces from XboxImage containers
+// DirectXTex Auxilary functions for creating resouces from XboxImage containers
 // via the CreatePlacement APIs
 //
 // Copyright (c) Microsoft Corporation.

Auxiliary/DirectXTexXboxD3D12X.cpp

@@ -1,7 +1,7 @@
 //-------------------------------------------------------------------------------------
 // DirectXTexD3D12X.cpp
 //
-// DirectXTex Auxillary functions for creating resouces from XboxImage containers
+// DirectXTex Auxilary functions for creating resouces from XboxImage containers
 // via the CreatePlacedResourceX API
 //
 // Copyright (c) Microsoft Corporation.

Auxiliary/DirectXTexXboxDDS.cpp

@@ -1,7 +1,7 @@
 //--------------------------------------------------------------------------------------
 // File: DirectXTexXboxDDS.cpp
 //
-// DirectXTex Auxillary functions for saving "XBOX" Xbox variants of DDS files
+// DirectXTex Auxilary functions for saving "XBOX" Xbox variants of DDS files
 //
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
@@ -23,39 +23,11 @@ using namespace Xbox;
 
 namespace
 {
-    const DDS_PIXELFORMAT DDSPF_XBOX =
-    { sizeof(DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('X','B','O','X'), 0, 0, 0, 0, 0 };
-
-#pragma pack(push,1)
-
-    struct DDS_HEADER_XBOX
-        // Must match structure in XboxDDSTextureLoader module
-    {
-        DXGI_FORMAT dxgiFormat;
-        uint32_t    resourceDimension;
-        uint32_t    miscFlag; // see DDS_RESOURCE_MISC_FLAG
-        uint32_t    arraySize;
-        uint32_t    miscFlags2; // see DDS_MISC_FLAGS2
-        uint32_t    tileMode; // see XG_TILE_MODE / XG_SWIZZLE_MODE
-        uint32_t    baseAlignment;
-        uint32_t    dataSize;
-        uint32_t    xdkVer; // matching _XDK_VER / _GXDK_VER
-    };
-
-#pragma pack(pop)
-
-    constexpr uint32_t XBOX_TILEMODE_SCARLETT = 0x1000000;
-
-    static_assert(sizeof(DDS_HEADER_XBOX) == 36, "DDS XBOX Header size mismatch");
-    static_assert(sizeof(DDS_HEADER_XBOX) >= sizeof(DDS_HEADER_DXT10), "DDS XBOX Header should be larger than DX10 header");
-
-    constexpr size_t XBOX_HEADER_SIZE = sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_XBOX);
-
     //-------------------------------------------------------------------------------------
     // Decodes DDS header using XBOX extended header (variant of DX10 header)
     //-------------------------------------------------------------------------------------
     HRESULT DecodeDDSHeader(
-        _In_reads_bytes_(size) const void* pSource,
+        _In_reads_bytes_(size) const uint8_t* pSource,
         size_t size,
         DirectX::TexMetadata& metadata,
         _Out_opt_ DDSMetaData* ddPixelFormat,
@@ -86,13 +58,13 @@ namespace
             *ddPixelFormat = {};
         }
 
-        if (size < (sizeof(DDS_HEADER) + sizeof(uint32_t)))
+        if (size < DDS_MIN_HEADER_SIZE)
         {
             return HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
         }
 
         // DDS files always start with the same magic number ("DDS ")
-        auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(pSource);
+        const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(pSource);
         if (dwMagicNumber != DDS_MAGIC)
         {
             return E_FAIL;
@@ -120,25 +92,13 @@ namespace
         }
 
         // Buffer must be big enough for both headers and magic value
-        if (size < XBOX_HEADER_SIZE)
+        if (size < DDS_XBOX_HEADER_SIZE)
         {
             return E_FAIL;
         }
 
         auto xboxext = reinterpret_cast<const DDS_HEADER_XBOX*>(
-            reinterpret_cast<const uint8_t*>(pSource) + sizeof(uint32_t) + sizeof(DDS_HEADER));
-
-    #ifdef _GXDK_VER
-        if (xboxext->xdkVer < _GXDK_VER)
-        {
-            OutputDebugStringA("WARNING: DDS XBOX file may be outdated and need regeneration\n");
-        }
-    #elif defined(_XDK_VER)
-        if (xboxext->xdkVer < _XDK_VER)
-        {
-            OutputDebugStringA("WARNING: DDS XBOX file may be outdated and need regeneration\n");
-        }
-    #endif
+            reinterpret_cast<const uint8_t*>(pSource) + DDS_MIN_HEADER_SIZE);
 
         metadata.arraySize = xboxext->arraySize;
         if (metadata.arraySize == 0)
@@ -256,20 +216,26 @@ namespace
 
         return S_OK;
     }
+}
 
 
-    //-------------------------------------------------------------------------------------
-    // Encodes DDS file header (magic value, header, XBOX extended header)
-    //-------------------------------------------------------------------------------------
-    HRESULT EncodeDDSHeader(
+//=====================================================================================
+// Entry-points
+//=====================================================================================
+
+//-------------------------------------------------------------------------------------
+// Encodes DDS file header (magic value, header, XBOX extended header)
+//-------------------------------------------------------------------------------------
+_Use_decl_annotations_
+HRESULT Xbox::EncodeDDSHeader(
     const XboxImage& xbox,
-        _Out_writes_(maxsize) void* pDestination,
-        size_t maxsize)
-    {
+    uint8_t* pDestination,
+    size_t maxsize) noexcept
+{
     if (!pDestination)
-            return E_POINTER;
+        return E_INVALIDARG;
 
-        if (maxsize < XBOX_HEADER_SIZE)
+    if (maxsize < DDS_XBOX_HEADER_SIZE)
         return E_NOT_SUFFICIENT_BUFFER;
 
     *reinterpret_cast<uint32_t*>(pDestination) = DDS_MAGIC;
@@ -393,36 +359,31 @@ namespace
 
     xboxext->miscFlags2 = metadata.miscFlags2;
 
-    #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
+#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
     xboxext->tileMode = static_cast<uint32_t>(xbox.GetTileMode()) | XBOX_TILEMODE_SCARLETT;
-    #else
+#else
     xboxext->tileMode = static_cast<uint32_t>(xbox.GetTileMode());
-    #endif
+#endif
 
     xboxext->baseAlignment = xbox.GetAlignment();
     xboxext->dataSize = xbox.GetSize();
-    #ifdef _GXDK_VER
+#ifdef _GXDK_VER
     xboxext->xdkVer = _GXDK_VER;
-    #elif defined(_XDK_VER)
+#elif defined(_XDK_VER)
     xboxext->xdkVer = _XDK_VER;
-    #endif
+#endif
 
     return S_OK;
-    }
 }
 
 
-//=====================================================================================
-// Entry-points
-//=====================================================================================
-
 //-------------------------------------------------------------------------------------
 // Obtain metadata from DDS file in memory/on disk
 //-------------------------------------------------------------------------------------
 
 _Use_decl_annotations_
 HRESULT Xbox::GetMetadataFromDDSMemory(
-    const void* pSource,
+    const uint8_t* pSource,
     size_t size,
     TexMetadata& metadata,
     bool& isXbox)
@@ -432,7 +393,7 @@ HRESULT Xbox::GetMetadataFromDDSMemory(
 
 _Use_decl_annotations_
 HRESULT Xbox::GetMetadataFromDDSMemoryEx(
-    const void* pSource,
+    const uint8_t* pSource,
     size_t size,
     TexMetadata& metadata,
     bool& isXbox,
@@ -478,12 +439,10 @@ HRESULT Xbox::GetMetadataFromDDSFileEx(
 
     isXbox = false;
 
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-    ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
-        FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
-#endif
+    ScopedHandle hFile(safe_handle(CreateFile2(
+        szFile,
+        GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
+        nullptr)));
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -503,16 +462,16 @@ HRESULT Xbox::GetMetadataFromDDSFileEx(
     }
 
     // Need at least enough data to fill the standard header and magic number to be a valid DDS
-    if (fileInfo.EndOfFile.LowPart < (sizeof(DDS_HEADER) + sizeof(uint32_t)))
+    if (fileInfo.EndOfFile.LowPart < DDS_MIN_HEADER_SIZE)
     {
         return E_FAIL;
     }
 
     // Read the header in (including extended header if present)
-    uint8_t header[XBOX_HEADER_SIZE] = {};
+    uint8_t header[DDS_XBOX_HEADER_SIZE] = {};
 
     DWORD bytesRead = 0;
-    if (!ReadFile(hFile.get(), header, XBOX_HEADER_SIZE, &bytesRead, nullptr))
+    if (!ReadFile(hFile.get(), header, DDS_XBOX_HEADER_SIZE, &bytesRead, nullptr))
     {
         return HRESULT_FROM_WIN32(GetLastError());
     }
@@ -537,7 +496,7 @@ HRESULT Xbox::GetMetadataFromDDSFileEx(
 //-------------------------------------------------------------------------------------
 _Use_decl_annotations_
 HRESULT Xbox::LoadFromDDSMemory(
-    const void* pSource,
+    const uint8_t* pSource,
     size_t size,
     TexMetadata* metadata,
     XboxImage& xbox)
@@ -547,7 +506,7 @@ HRESULT Xbox::LoadFromDDSMemory(
 
 _Use_decl_annotations_
 HRESULT Xbox::LoadFromDDSMemoryEx(
-    const void* pSource,
+    const uint8_t* pSource,
     size_t size,
     TexMetadata* metadata,
     DDSMetaData* ddPixelFormat,
@@ -578,13 +537,13 @@ HRESULT Xbox::LoadFromDDSMemoryEx(
         return E_FAIL;
     }
 
-    if (size <= XBOX_HEADER_SIZE)
+    if (size <= DDS_XBOX_HEADER_SIZE)
     {
         return E_FAIL;
     }
 
     // Copy tiled data
-    const size_t remaining = size - XBOX_HEADER_SIZE;
+    const size_t remaining = size - DDS_XBOX_HEADER_SIZE;
 
     if (remaining < dataSize)
     {
@@ -597,7 +556,7 @@ HRESULT Xbox::LoadFromDDSMemoryEx(
 
     assert(xbox.GetPointer() != nullptr);
 
-    memcpy(xbox.GetPointer(), reinterpret_cast<const uint8_t*>(pSource) + XBOX_HEADER_SIZE, dataSize);
+    memcpy(xbox.GetPointer(), reinterpret_cast<const uint8_t*>(pSource) + DDS_XBOX_HEADER_SIZE, dataSize);
 
     if (metadata)
         memcpy(metadata, &mdata, sizeof(TexMetadata));
@@ -630,13 +589,10 @@ HRESULT Xbox::LoadFromDDSFileEx(
 
     xbox.Release();
 
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-    ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
-        FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
-#endif
-
+    ScopedHandle hFile(safe_handle(CreateFile2(
+        szFile,
+        GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
+        nullptr)));
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -656,16 +612,16 @@ HRESULT Xbox::LoadFromDDSFileEx(
     }
 
     // Need at least enough data to fill the standard header and magic number to be a valid DDS
-    if (fileInfo.EndOfFile.LowPart < (sizeof(DDS_HEADER) + sizeof(uint32_t)))
+    if (fileInfo.EndOfFile.LowPart < DDS_MIN_HEADER_SIZE)
     {
         return E_FAIL;
     }
 
     // Read the header in (including extended header if present)
-    uint8_t header[XBOX_HEADER_SIZE] = {};
+    uint8_t header[DDS_XBOX_HEADER_SIZE] = {};
 
     DWORD bytesRead = 0;
-    if (!ReadFile(hFile.get(), header, XBOX_HEADER_SIZE, &bytesRead, nullptr))
+    if (!ReadFile(hFile.get(), header, DDS_XBOX_HEADER_SIZE, &bytesRead, nullptr))
     {
         return HRESULT_FROM_WIN32(GetLastError());
     }
@@ -689,7 +645,7 @@ HRESULT Xbox::LoadFromDDSFileEx(
     }
 
     // Read tiled data
-    const DWORD remaining = fileInfo.EndOfFile.LowPart - XBOX_HEADER_SIZE;
+    const DWORD remaining = fileInfo.EndOfFile.LowPart - DDS_XBOX_HEADER_SIZE;
     if (remaining == 0)
         return E_FAIL;
 
@@ -728,15 +684,15 @@ HRESULT Xbox::SaveToDDSMemory(const XboxImage& xbox, Blob& blob)
 
     blob.Release();
 
-    HRESULT hr = blob.Initialize(XBOX_HEADER_SIZE + xbox.GetSize());
+    HRESULT hr = blob.Initialize(DDS_XBOX_HEADER_SIZE + xbox.GetSize());
     if (FAILED(hr))
         return hr;
 
     // Copy header
-    auto pDestination = reinterpret_cast<uint8_t*>(blob.GetBufferPointer());
+    auto pDestination = blob.GetBufferPointer();
     assert(pDestination);
 
-    hr = EncodeDDSHeader(xbox, pDestination, XBOX_HEADER_SIZE);
+    hr = EncodeDDSHeader(xbox, pDestination, DDS_XBOX_HEADER_SIZE);
     if (FAILED(hr))
     {
         blob.Release();
@@ -744,8 +700,8 @@ HRESULT Xbox::SaveToDDSMemory(const XboxImage& xbox, Blob& blob)
     }
 
     // Copy tiled data
-    const size_t remaining = blob.GetBufferSize() - XBOX_HEADER_SIZE;
-    pDestination += XBOX_HEADER_SIZE;
+    const size_t remaining = blob.GetBufferSize() - DDS_XBOX_HEADER_SIZE;
+    pDestination += DDS_XBOX_HEADER_SIZE;
 
     if (!remaining)
     {
@@ -775,31 +731,28 @@ HRESULT Xbox::SaveToDDSFile(const XboxImage& xbox, const wchar_t* szFile)
         return E_INVALIDARG;
 
     // Create DDS Header
-    uint8_t header[XBOX_HEADER_SIZE] = {};
-    HRESULT hr = EncodeDDSHeader(xbox, header, XBOX_HEADER_SIZE);
+    uint8_t header[DDS_XBOX_HEADER_SIZE] = {};
+    HRESULT hr = EncodeDDSHeader(xbox, header, DDS_XBOX_HEADER_SIZE);
     if (FAILED(hr))
         return hr;
 
     // Create file and write header
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-    ScopedHandle hFile(safe_handle(CreateFile2(szFile,
-        GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(szFile,
-        GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr)));
-#endif
+    ScopedHandle hFile(safe_handle(CreateFile2(
+        szFile,
+        GENERIC_WRITE, 0, CREATE_ALWAYS,
+        nullptr)));
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
     }
 
     DWORD bytesWritten;
-    if (!WriteFile(hFile.get(), header, static_cast<DWORD>(XBOX_HEADER_SIZE), &bytesWritten, nullptr))
+    if (!WriteFile(hFile.get(), header, static_cast<DWORD>(DDS_XBOX_HEADER_SIZE), &bytesWritten, nullptr))
     {
         return HRESULT_FROM_WIN32(GetLastError());
     }
 
-    if (bytesWritten != XBOX_HEADER_SIZE)
+    if (bytesWritten != DDS_XBOX_HEADER_SIZE)
     {
         return E_FAIL;
     }

Auxiliary/DirectXTexXboxDetile.cpp

@@ -1,7 +1,7 @@
 //--------------------------------------------------------------------------------------
 // File: DirectXTexXboxDetile.cpp
 //
-// DirectXTex Auxillary functions for converting from Xbox tiled to linear
+// DirectXTex Auxilary functions for converting from Xbox tiled to linear
 //
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
@@ -32,7 +32,9 @@ namespace
         const uint8_t* sptr = xbox.GetPointer();
         const uint8_t* endPtr = sptr + layout.SizeBytes;
 
-        for (uint32_t item = 0; item < nimages; ++item)
+        assert((nimages > 0) && (nimages <= UINT32_MAX));
+
+        for (size_t item = 0; item < nimages; ++item)
         {
             const Image* img = result[item];
             if (!img || !img->pixels)
@@ -49,9 +51,9 @@ namespace
             {
             #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
                 const UINT64 element = (packed) ? (x >> 1) : x;
-                const size_t offset = computer->GetTexelElementOffsetBytes(0, level, element, 0, item, 0, nullptr);
+                const size_t offset = computer->GetTexelElementOffsetBytes(0, static_cast<uint32_t>(level), element, 0, static_cast<uint32_t>(item), 0, nullptr);
             #else
-                const size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, item, 0);
+                const size_t offset = computer->GetTexelElementOffsetBytes(0, static_cast<uint32_t>(level), x, 0, static_cast<uint32_t>(item), 0);
             #endif
                 if (offset == size_t(-1))
                     return E_FAIL;
@@ -72,127 +74,6 @@ namespace
         return S_OK;
     }
 
-    //----------------------------------------------------------------------------------
-    inline HRESULT DetileByElement2D(
-        const XboxImage& xbox,
-        uint32_t level,
-        _In_ XGTextureAddressComputer* computer,
-        const XG_RESOURCE_LAYOUT& layout,
-        _In_reads_(nimages) const Image* const * result,
-        size_t nimages,
-        size_t bpp,
-        size_t w,
-        size_t h,
-        bool packed)
-    {
-        const uint8_t* sptr = xbox.GetPointer();
-        const uint8_t* endPtr = sptr + layout.SizeBytes;
-
-        for (uint32_t item = 0; item < nimages; ++item)
-        {
-            const Image* img = result[item];
-            if (!img || !img->pixels)
-                return E_POINTER;
-
-            assert(img->width == result[0]->width);
-            assert(img->height == result[0]->height);
-            assert(img->rowPitch == result[0]->rowPitch);
-            assert(img->format == result[0]->format);
-
-            uint8_t* dptr = img->pixels;
-
-            for (uint32_t y = 0; y < h; ++y)
-            {
-                uint8_t* tptr = dptr;
-
-                for (size_t x = 0; x < w; ++x)
-                {
-                #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-                    const UINT64 element = (packed) ? (x >> 1) : x;
-                    const size_t offset = computer->GetTexelElementOffsetBytes(0, level, element, y, item, 0, nullptr);
-                #else
-                    const size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, y, item, 0);
-                #endif
-                    if (offset == size_t(-1))
-                        return E_FAIL;
-
-                    const uint8_t* src = sptr + offset;
-
-                    if ((src + bpp) > endPtr)
-                        return E_FAIL;
-
-                    memcpy(tptr, src, bpp);
-                    tptr += bpp;
-
-                    if (packed)
-                        ++x;
-                }
-
-                dptr += img->rowPitch;
-            }
-        }
-
-        return S_OK;
-    }
-
-    //----------------------------------------------------------------------------------
-    inline HRESULT DetileByElement3D(
-        const XboxImage& xbox,
-        uint32_t level,
-        uint32_t slices,
-        _In_ XGTextureAddressComputer* computer,
-        const XG_RESOURCE_LAYOUT& layout,
-        const Image& result,
-        size_t bpp,
-        size_t w,
-        size_t h,
-        bool packed)
-    {
-        const uint8_t* sptr = xbox.GetPointer();
-        const uint8_t* endPtr = sptr + layout.SizeBytes;
-
-        uint8_t* dptr = result.pixels;
-
-        for (uint32_t z = 0; z < slices; ++z)
-        {
-            uint8_t* rptr = dptr;
-
-            for (uint32_t y = 0; y < h; ++y)
-            {
-                uint8_t* tptr = rptr;
-
-                for (size_t x = 0; x < w; ++x)
-                {
-                #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-                    const UINT64 element = (packed) ? (x >> 1) : x;
-                    const size_t offset = computer->GetTexelElementOffsetBytes(0, level, element, y, z, 0, nullptr);
-                #else
-                    const size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, y, z, 0);
-                #endif
-                    if (offset == size_t(-1))
-                        return E_FAIL;
-
-                    const uint8_t* src = sptr + offset;
-
-                    if ((src + bpp) > endPtr)
-                        return E_FAIL;
-
-                    memcpy(tptr, src, bpp);
-                    tptr += bpp;
-
-                    if (packed)
-                        ++x;
-                }
-
-                rptr += result.rowPitch;
-            }
-
-            dptr += result.slicePitch;
-        }
-
-        return S_OK;
-    }
-
     //-------------------------------------------------------------------------------------
     // 1D Tiling
     //-------------------------------------------------------------------------------------
@@ -204,7 +85,7 @@ namespace
         _In_reads_(nimages) const Image** result,
         size_t nimages)
     {
-        if (!nimages)
+        if (!nimages || nimages > UINT32_MAX)
             return E_INVALIDARG;
 
         if (!xbox.GetPointer() || !computer || !result || !result[0])
@@ -271,7 +152,7 @@ namespace
                 return E_FAIL;
 
             // Perform detiling
-            for (uint32_t item = 0; item < nimages; ++item)
+            for (size_t item = 0; item < nimages; ++item)
             {
                 const Image* img = result[item];
                 if (!img || !img->pixels)
@@ -285,9 +166,9 @@ namespace
                 for (size_t x = 0; x < img->width; ++x)
                 {
                 #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-                    size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, item, 0, nullptr);
+                    size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, static_cast<uint32_t>(item), 0, nullptr);
                 #else
-                    size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, item, 0);
+                    size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, static_cast<uint32_t>(item), 0);
                 #endif
                     if (offset == size_t(-1))
                         return E_FAIL;
@@ -317,11 +198,10 @@ namespace
         const XboxImage& xbox,
         uint32_t level,
         _In_ XGTextureAddressComputer* computer,
-        const XG_RESOURCE_LAYOUT& layout,
         _In_reads_(nimages) const Image** result,
         size_t nimages)
     {
-        if (!nimages)
+        if (!nimages || nimages > UINT32_MAX)
             return E_INVALIDARG;
 
         if (!xbox.GetPointer() || !computer || !result || !result[0])
@@ -329,90 +209,10 @@ namespace
 
         assert(xbox.GetMetadata().format == result[0]->format);
 
-        assert(layout.Planes == 1);
+        uint8_t* baseAddr = xbox.GetPointer();
+        const auto& metadata = xbox.GetMetadata();
 
-        const DXGI_FORMAT format = result[0]->format;
-
-        assert(format == xbox.GetMetadata().format);
-
-        bool byelement = IsTypeless(format);
-    #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-        if (nimages > 1)
-            byelement = true;
-    #endif
-
-        if (IsCompressed(format))
-        {
-            //--- BC formats use per-block copy -------------------------------------------
-            const size_t nbw = std::max<size_t>(1, (result[0]->width + 3) / 4);
-            const size_t nbh = std::max<size_t>(1, (result[0]->height + 3) / 4);
-
-            const size_t bpb = (format == DXGI_FORMAT_BC1_TYPELESS
-                || format == DXGI_FORMAT_BC1_UNORM
-                || format == DXGI_FORMAT_BC1_UNORM_SRGB
-                || format == DXGI_FORMAT_BC4_TYPELESS
-                || format == DXGI_FORMAT_BC4_UNORM
-                || format == DXGI_FORMAT_BC4_SNORM) ? 8 : 16;
-
-            assert(nbw == layout.Plane[0].MipLayout[level].WidthElements);
-            assert(nbh == layout.Plane[0].MipLayout[level].HeightElements);
-            assert(bpb == layout.Plane[0].BytesPerElement);
-
-            return DetileByElement2D(xbox, level, computer, layout, result, nimages, bpb, nbw, nbh, false);
-        }
-        else if (IsPacked(format))
-        {
-            const size_t bpp = (BitsPerPixel(format) + 7) / 8;
-
-            // XG (XboxOne) incorrectly returns 2 instead of 4 here for layout.Plane[0].BytesPerElement
-
-            const size_t w = result[0]->width;
-            const size_t h = result[0]->height;
-            assert(((w + 1) / 2) == layout.Plane[0].MipLayout[level].WidthElements);
-            assert(h == layout.Plane[0].MipLayout[level].HeightElements);
-
-            return DetileByElement2D(xbox, level, computer, layout, result, nimages, bpp, w, h, true);
-        }
-        else if (byelement)
-        {
-            //--- Typeless is done with per-element copy ----------------------------------
-            const size_t bpp = (BitsPerPixel(format) + 7) / 8;
-            assert(bpp == layout.Plane[0].BytesPerElement);
-
-            const size_t w = result[0]->width;
-            const size_t h = result[0]->height;
-
-            assert(w == layout.Plane[0].MipLayout[level].WidthElements);
-            assert(h == layout.Plane[0].MipLayout[level].HeightElements);
-
-            return DetileByElement2D(xbox, level, computer, layout, result, nimages, bpp, w, h, false);
-        }
-        else
-        {
-            //--- Standard format handling ------------------------------------------------
-            auto& mip = layout.Plane[0].MipLayout[level];
-
-            const UINT32 tiledPixels = mip.PaddedWidthElements * mip.PaddedHeightElements * mip.PaddedDepthOrArraySize;
-
-            auto scanline = make_AlignedArrayXMVECTOR(tiledPixels + result[0]->width);
-
-            XMVECTOR* target = scanline.get();
-            XMVECTOR* tiled = target + result[0]->width;
-
-        #ifdef _DEBUG
-            memset(target, 0xCD, sizeof(XMVECTOR) * result[0]->width);
-            memset(tiled, 0xDD, sizeof(XMVECTOR) * tiledPixels);
-        #endif
-
-                    // Load tiled texture
-            if ((xbox.GetSize() - mip.OffsetBytes) < mip.SizeBytes)
-                return E_FAIL;
-
-            if (!LoadScanline(tiled, tiledPixels, xbox.GetPointer() + mip.OffsetBytes, mip.SizeBytes, xbox.GetMetadata().format))
-                return E_FAIL;
-
-            // Perform detiling
-            for (uint32_t item = 0; item < nimages; ++item)
+        for (size_t item = 0; item < nimages; ++item)
         {
             const Image* img = result[item];
             if (!img || !img->pixels)
@@ -423,33 +223,19 @@ namespace
             assert(img->rowPitch == result[0]->rowPitch);
             assert(img->format == result[0]->format);
 
-                auto dptr = reinterpret_cast<uint8_t * __restrict>(img->pixels);
-                for (uint32_t y = 0; y < img->height; ++y)
-                {
-                    for (size_t x = 0; x < img->width; ++x)
-                    {
+            HRESULT hr = computer->CopyFromSubresource(
+                img->pixels,
+                0u,
+                metadata.CalculateSubresource(level, item),
             #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-                        size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, y, item, 0, nullptr);
-                    #else
-                        size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, y, item, 0);
+                0u,
             #endif
-                        if (offset == size_t(-1))
-                            return E_FAIL;
-
-                        assert(offset >= mip.OffsetBytes);
-                        assert(offset < mip.OffsetBytes + mip.SizeBytes);
-
-                        offset = (offset - mip.OffsetBytes) / layout.Plane[0].BytesPerElement;
-                        assert(offset < tiledPixels);
-
-                        target[x] = tiled[offset];
-                    }
-
-                    if (!StoreScanline(dptr, img->rowPitch, img->format, target, img->width))
-                        return E_FAIL;
-
-                    dptr += img->rowPitch;
-                }
+                baseAddr,
+                static_cast<UINT32>(img->rowPitch),
+                0u);
+            if (FAILED(hr))
+            {
+                return hr;
             }
         }
 
@@ -463,9 +249,7 @@ namespace
     HRESULT Detile3D(
         const XboxImage& xbox,
         uint32_t level,
-        uint32_t slices,
         _In_ XGTextureAddressComputer* computer,
-        const XG_RESOURCE_LAYOUT& layout,
         const Image& result)
     {
         if (!computer || !xbox.GetPointer() || !result.pixels)
@@ -473,139 +257,19 @@ namespace
 
         assert(xbox.GetMetadata().format == result.format);
 
-        assert(layout.Planes == 1);
+        uint8_t* baseAddr = xbox.GetPointer();
+        const auto& metadata = xbox.GetMetadata();
 
+        return computer->CopyFromSubresource(
+            result.pixels,
+            0u,
+            metadata.CalculateSubresource(level, 0),
         #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-        const bool byelement = true;
-    #else
-        const bool byelement = IsTypeless(result.format);
+            0u,
         #endif
-
-        if (IsCompressed(result.format))
-        {
-            //--- BC formats use per-block copy -------------------------------------------
-            const size_t nbw = std::max<size_t>(1, (result.width + 3) / 4);
-            const size_t nbh = std::max<size_t>(1, (result.height + 3) / 4);
-
-            const size_t bpb = (result.format == DXGI_FORMAT_BC1_TYPELESS
-                || result.format == DXGI_FORMAT_BC1_UNORM
-                || result.format == DXGI_FORMAT_BC1_UNORM_SRGB
-                || result.format == DXGI_FORMAT_BC4_TYPELESS
-                || result.format == DXGI_FORMAT_BC4_UNORM
-                || result.format == DXGI_FORMAT_BC4_SNORM) ? 8 : 16;
-
-            assert(nbw == layout.Plane[0].MipLayout[level].WidthElements);
-            assert(nbh == layout.Plane[0].MipLayout[level].HeightElements);
-            assert(bpb == layout.Plane[0].BytesPerElement);
-
-            return DetileByElement3D(xbox, level, slices, computer, layout, result, bpb, nbw, nbh, false);
-        }
-        else if (IsPacked(result.format))
-        {
-            const size_t bpp = (BitsPerPixel(result.format) + 7) / 8;
-
-            // XG (XboxOne) incorrectly returns 2 instead of 4 here for layout.Plane[0].BytesPerElement
-
-            assert(((result.width + 1) / 2) == layout.Plane[0].MipLayout[level].WidthElements);
-            assert(result.height == layout.Plane[0].MipLayout[level].HeightElements);
-
-            return DetileByElement3D(xbox, level, slices, computer, layout, result, bpp, result.width, result.height, true);
-        }
-        else if (byelement)
-        {
-            //--- Typeless is done with per-element copy ----------------------------------
-            const size_t bpp = (BitsPerPixel(result.format) + 7) / 8;
-            assert(bpp == layout.Plane[0].BytesPerElement);
-
-            assert(result.width == layout.Plane[0].MipLayout[level].WidthElements);
-            assert(result.height == layout.Plane[0].MipLayout[level].HeightElements);
-
-            return DetileByElement3D(xbox, level, slices, computer, layout, result, bpp, result.width, result.height, false);
-        }
-        else
-        {
-            //--- Standard format handling ------------------------------------------------
-            auto& mip = layout.Plane[0].MipLayout[level];
-
-            const UINT32 tiledPixels = mip.PaddedWidthElements * mip.PaddedHeightElements * mip.PaddedDepthOrArraySize;
-            assert(tiledPixels >= (result.width * result.height * slices));
-
-            auto scanline = make_AlignedArrayXMVECTOR(tiledPixels + result.width);
-
-            XMVECTOR* target = scanline.get();
-            XMVECTOR* tiled = target + result.width;
-
-        #ifdef _DEBUG
-            memset(target, 0xCD, sizeof(XMVECTOR) * result.width);
-            memset(tiled, 0xDD, sizeof(XMVECTOR) * tiledPixels);
-        #endif
-
-                    // Load tiled texture
-            if ((xbox.GetSize() - mip.OffsetBytes) < mip.SizeBytes)
-                return E_FAIL;
-
-            const uint8_t* sptr = xbox.GetPointer() + mip.OffsetBytes;
-            const uint8_t* endPtr = sptr + mip.SizeBytes;
-            XMVECTOR* tptr = tiled;
-            for (uint32_t z = 0; z < mip.PaddedDepthOrArraySize; ++z)
-            {
-                const uint8_t* rptr = sptr;
-                XMVECTOR* uptr = tptr;
-
-                for (uint32_t y = 0; y < mip.PaddedHeightElements; ++y)
-                {
-                    if ((rptr + mip.PitchBytes) > endPtr)
-                        return E_FAIL;
-
-                    if (!LoadScanline(uptr, mip.PitchPixels, rptr, mip.PitchBytes, xbox.GetMetadata().format))
-                        return E_FAIL;
-
-                    rptr += mip.PitchBytes;
-                    uptr += mip.PaddedWidthElements;
-                }
-
-                sptr += mip.Slice2DSizeBytes;
-                tptr += size_t(mip.PaddedHeightElements) * size_t(mip.PaddedWidthElements);
-            }
-
-            // Perform detiling
-            uint8_t* dptr = reinterpret_cast<uint8_t*>(result.pixels);
-            for (uint32_t z = 0; z < slices; ++z)
-            {
-                uint8_t* rptr = dptr;
-
-                for (uint32_t y = 0; y < result.height; ++y)
-                {
-                    for (size_t x = 0; x < result.width; ++x)
-                    {
-                    #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-                        size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, y, z, 0, nullptr);
-                    #else
-                        size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, y, z, 0);
-                    #endif
-                        if (offset == size_t(-1))
-                            return E_FAIL;
-
-                        assert(offset >= mip.OffsetBytes);
-                        assert(offset < mip.OffsetBytes + mip.SizeBytes);
-
-                        offset = (offset - mip.OffsetBytes) / layout.Plane[0].BytesPerElement;
-                        assert(offset < tiledPixels);
-
-                        target[x] = tiled[offset];
-                    }
-
-                    if (!StoreScanline(rptr, result.rowPitch, result.format, target, result.width))
-                        return E_FAIL;
-
-                    rptr += result.rowPitch;
-                }
-
-                dptr += result.slicePitch;
-            }
-        }
-
-        return S_OK;
+            baseAddr,
+            static_cast<UINT32>(result.rowPitch),
+            static_cast<UINT32>(result.slicePitch));
     }
 }
 
@@ -652,6 +316,11 @@ HRESULT Xbox::Detile(
     {
     case TEX_DIMENSION_TEXTURE1D:
         {
+            if (metadata.width > D3D11_REQ_TEXTURE1D_U_DIMENSION
+                || metadata.mipLevels > D3D11_REQ_MIP_LEVELS
+                || metadata.arraySize > D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION)
+                return E_INVALIDARG;
+
             XG_TEXTURE1D_DESC desc = {};
             desc.Width = static_cast<UINT>(metadata.width);
             desc.MipLevels = static_cast<UINT>(metadata.mipLevels);
@@ -686,13 +355,13 @@ HRESULT Xbox::Detile(
             if (FAILED(hr))
                 return hr;
 
-            for (uint32_t level = 0; level < metadata.mipLevels; ++level)
+            for (size_t level = 0; level < metadata.mipLevels; ++level)
             {
                 if (metadata.arraySize > 1)
                 {
                     std::vector<const Image*> images;
                     images.reserve(metadata.arraySize);
-                    for (uint32_t item = 0; item < metadata.arraySize; ++item)
+                    for (size_t item = 0; item < metadata.arraySize; ++item)
                     {
                         const Image* img = image.GetImage(level, item, 0);
                         if (!img)
@@ -704,7 +373,7 @@ HRESULT Xbox::Detile(
                         images.push_back(img);
                     }
 
-                    hr = Detile1D(xbox, level, computer.Get(), layout, &images[0], images.size());
+                    hr = Detile1D(xbox, static_cast<uint32_t>(level), computer.Get(), layout, &images[0], images.size());
                 }
                 else
                 {
@@ -715,7 +384,7 @@ HRESULT Xbox::Detile(
                         return E_FAIL;
                     }
 
-                    hr = Detile1D(xbox, level, computer.Get(), layout, &img, 1);
+                    hr = Detile1D(xbox, static_cast<uint32_t>(level), computer.Get(), layout, &img, 1);
                 }
 
                 if (FAILED(hr))
@@ -729,6 +398,12 @@ HRESULT Xbox::Detile(
 
     case TEX_DIMENSION_TEXTURE2D:
         {
+            if (metadata.width > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION
+                || metadata.height > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION
+                || metadata.mipLevels > D3D11_REQ_MIP_LEVELS
+                || metadata.arraySize > D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION)
+                return E_INVALIDARG;
+
             XG_TEXTURE2D_DESC desc = {};
             desc.Width = static_cast<UINT>(metadata.width);
             desc.Height = static_cast<UINT>(metadata.height);
@@ -765,13 +440,13 @@ HRESULT Xbox::Detile(
             if (FAILED(hr))
                 return hr;
 
-            for (uint32_t level = 0; level < metadata.mipLevels; ++level)
+            for (size_t level = 0; level < metadata.mipLevels; ++level)
             {
                 if (metadata.arraySize > 1)
                 {
                     std::vector<const Image*> images;
                     images.reserve(metadata.arraySize);
-                    for (uint32_t item = 0; item < metadata.arraySize; ++item)
+                    for (size_t item = 0; item < metadata.arraySize; ++item)
                     {
                         const Image* img = image.GetImage(level, item, 0);
                         if (!img)
@@ -783,7 +458,7 @@ HRESULT Xbox::Detile(
                         images.push_back(img);
                     }
 
-                    hr = Detile2D(xbox, level, computer.Get(), layout, &images[0], images.size());
+                    hr = Detile2D(xbox, static_cast<uint32_t>(level), computer.Get(), &images[0], images.size());
                 }
                 else
                 {
@@ -794,7 +469,7 @@ HRESULT Xbox::Detile(
                         return E_FAIL;
                     }
 
-                    hr = Detile2D(xbox, level, computer.Get(), layout, &img, 1);
+                    hr = Detile2D(xbox, static_cast<uint32_t>(level), computer.Get(), &img, 1);
                 }
 
                 if (FAILED(hr))
@@ -808,6 +483,13 @@ HRESULT Xbox::Detile(
 
     case TEX_DIMENSION_TEXTURE3D:
         {
+            if (metadata.width > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION
+                || metadata.height > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION
+                || metadata.depth > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION
+                || metadata.mipLevels > D3D11_REQ_MIP_LEVELS
+                || metadata.arraySize != 1)
+                return E_INVALIDARG;
+
             XG_TEXTURE3D_DESC desc = {};
             desc.Width = static_cast<UINT>(metadata.width);
             desc.Height = static_cast<UINT>(metadata.height);
@@ -842,10 +524,10 @@ HRESULT Xbox::Detile(
             if (FAILED(hr))
                 return hr;
 
-            uint32_t d = static_cast<uint32_t>(metadata.depth);
+            auto d = static_cast<uint32_t>(metadata.depth);
 
             size_t index = 0;
-            for (uint32_t level = 0; level < metadata.mipLevels; ++level)
+            for (size_t level = 0; level < metadata.mipLevels; ++level)
             {
                 if ((index + d) > image.GetImageCount())
                 {
@@ -854,7 +536,7 @@ HRESULT Xbox::Detile(
                 }
 
                 // Relies on the fact that slices are contiguous
-                hr = Detile3D(xbox, level, d, computer.Get(), layout, image.GetImages()[index]);
+                hr = Detile3D(xbox, static_cast<uint32_t>(level), computer.Get(), image.GetImages()[index]);
                 if (FAILED(hr))
                 {
                     image.Release();

Auxiliary/DirectXTexXboxImage.cpp

@@ -1,7 +1,7 @@
 //--------------------------------------------------------------------------------------
 // File: DirectXTexXboxImage.cpp
 //
-// DirectXTex Auxillary functions for Xbox texture blob
+// DirectXTex Auxilary functions for Xbox texture blob
 //
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.

Auxiliary/DirectXTexXboxTile.cpp

@@ -1,7 +1,7 @@
 //--------------------------------------------------------------------------------------
 // File: DirectXTexXboxTile.cpp
 //
-// DirectXTex Auxillary functions for converting from linear to Xbox tiling
+// DirectXTex Auxilary functions for converting from linear to Xbox tiling
 //
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
@@ -34,7 +34,7 @@ namespace
         uint8_t* dptr = xbox.GetPointer();
         const uint8_t* endPtr = dptr + layout.SizeBytes;
 
-        for (uint32_t item = 0; item < nimages; ++item)
+        for (size_t item = 0; item < nimages; ++item)
         {
             const Image* img = images[item];
 
@@ -52,9 +52,9 @@ namespace
             {
             #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
                 UINT64 element = (packed) ? (x >> 1) : x;
-                size_t offset = computer->GetTexelElementOffsetBytes(0, level, element, 0, item, 0, nullptr);
+                size_t offset = computer->GetTexelElementOffsetBytes(0, level, element, 0, static_cast<uint32_t>(item), 0, nullptr);
             #else
-                size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, item, 0);
+                size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, static_cast<uint32_t>(item), 0);
             #endif
                 if (offset == size_t(-1))
                     return E_FAIL;
@@ -75,126 +75,6 @@ namespace
         return S_OK;
     }
 
-    //----------------------------------------------------------------------------------
-    inline HRESULT TileByElement2D(
-        _In_reads_(nimages) const Image* const * images,
-        size_t nimages,
-        uint32_t level,
-        _In_ XGTextureAddressComputer* computer,
-        const XG_RESOURCE_LAYOUT& layout,
-        const XboxImage& xbox,
-        size_t bpp,
-        size_t w,
-        size_t h,
-        bool packed)
-    {
-        uint8_t* dptr = xbox.GetPointer();
-        const uint8_t* endPtr = dptr + layout.SizeBytes;
-
-        for (uint32_t item = 0; item < nimages; ++item)
-        {
-            const Image* img = images[item];
-
-            if (!img || !img->pixels)
-                return E_POINTER;
-
-            assert(img->width == images[0]->width);
-            assert(img->height == images[0]->height);
-            assert(img->rowPitch == images[0]->rowPitch);
-            assert(img->format == images[0]->format);
-
-            const uint8_t* sptr = img->pixels;
-            for (uint32_t y = 0; y < h; ++y)
-            {
-                const uint8_t* tptr = sptr;
-
-                for (size_t x = 0; x < w; ++x)
-                {
-                #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-                    UINT64 element = (packed) ? (x >> 1) : x;
-                    size_t offset = computer->GetTexelElementOffsetBytes(0, level, element, y, item, 0, nullptr);
-                #else
-                    size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, y, item, 0);
-                #endif
-                    if (offset == size_t(-1))
-                        return E_FAIL;
-
-                    uint8_t* dest = dptr + offset;
-
-                    if ((dest + bpp) > endPtr)
-                        return E_FAIL;
-
-                    memcpy(dest, tptr, bpp);
-                    tptr += bpp;
-
-                    if (packed)
-                        ++x;
-                }
-
-                sptr += img->rowPitch;
-            }
-        }
-
-        return S_OK;
-    }
-
-    //----------------------------------------------------------------------------------
-    inline HRESULT TileByElement3D(
-        const Image& image,
-        uint32_t level,
-        uint32_t slices,
-        _In_ XGTextureAddressComputer* computer,
-        const XG_RESOURCE_LAYOUT& layout,
-        const XboxImage& xbox,
-        size_t bpp,
-        size_t w,
-        size_t h,
-        bool packed)
-    {
-        uint8_t* dptr = xbox.GetPointer();
-        const uint8_t* endPtr = dptr + layout.SizeBytes;
-
-        const uint8_t* sptr = image.pixels;
-        for (uint32_t z = 0; z < slices; ++z)
-        {
-            const uint8_t* rptr = sptr;
-
-            for (uint32_t y = 0; y < h; ++y)
-            {
-                const uint8_t* tptr = rptr;
-
-                for (size_t x = 0; x < w; ++x)
-                {
-                #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-                    UINT64 element = (packed) ? (x >> 1) : x;
-                    size_t offset = computer->GetTexelElementOffsetBytes(0, level, element, y, z, 0, nullptr);
-                #else
-                    size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, y, z, 0);
-                #endif
-                    if (offset == size_t(-1))
-                        return E_FAIL;
-
-                    uint8_t* dest = dptr + offset;
-
-                    if ((dest + bpp) > endPtr)
-                        return E_FAIL;
-
-                    memcpy(dest, tptr, bpp);
-                    tptr += bpp;
-
-                    if (packed)
-                        ++x;
-                }
-
-                rptr += image.rowPitch;
-            }
-
-            sptr += image.slicePitch;
-        }
-
-        return S_OK;
-    }
-
     //----------------------------------------------------------------------------------
 #ifdef VERBOSE
     void DebugPrintDesc(const XG_TEXTURE1D_DESC& desc)
@@ -289,7 +169,7 @@ namespace
         const XG_RESOURCE_LAYOUT& layout,
         const XboxImage& xbox)
     {
-        if (!nimages)
+        if (!nimages || nimages > UINT32_MAX)
             return E_INVALIDARG;
 
         if (!images || !images[0] || !computer || !xbox.GetPointer())
@@ -350,7 +230,7 @@ namespace
             memset(tiled, 0, sizeof(XMVECTOR) * tiledPixels);
 
             // Perform tiling
-            for (uint32_t item = 0; item < nimages; ++item)
+            for (size_t item = 0; item < nimages; ++item)
             {
                 const Image* img = images[item];
 
@@ -368,9 +248,9 @@ namespace
                 for (size_t x = 0; x < img->width; ++x)
                 {
                 #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-                    size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, item, 0, nullptr);
+                    size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, static_cast<uint32_t>(item), 0, nullptr);
                 #else
-                    size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, item, 0);
+                    size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, static_cast<uint32_t>(item), 0);
                 #endif
                     if (offset == size_t(-1))
                         return E_FAIL;
@@ -403,93 +283,18 @@ namespace
         size_t nimages,
         uint32_t level,
         _In_ XGTextureAddressComputer* computer,
-        const XG_RESOURCE_LAYOUT& layout,
         const XboxImage& xbox)
     {
-        if (!nimages)
+        if (!nimages || nimages > UINT32_MAX)
             return E_INVALIDARG;
 
         if (!images || !images[0] || !computer || !xbox.GetPointer())
             return E_POINTER;
 
-        assert(layout.Planes == 1);
+        uint8_t* baseAddr = xbox.GetPointer();
+        const auto& metadata = xbox.GetMetadata();
 
-        const DXGI_FORMAT format = images[0]->format;
-
-        assert(format == xbox.GetMetadata().format);
-
-        bool byelement = IsTypeless(format);
-    #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-        if (nimages > 1)
-            byelement = true;
-    #endif
-
-        if (IsCompressed(format))
-        {
-            //--- BC formats use per-block copy -------------------------------------------
-            const size_t nbw = std::max<size_t>(1, (images[0]->width + 3) / 4);
-            const size_t nbh = std::max<size_t>(1, (images[0]->height + 3) / 4);
-
-            const size_t bpb = (format == DXGI_FORMAT_BC1_TYPELESS
-                || format == DXGI_FORMAT_BC1_UNORM
-                || format == DXGI_FORMAT_BC1_UNORM_SRGB
-                || format == DXGI_FORMAT_BC4_TYPELESS
-                || format == DXGI_FORMAT_BC4_UNORM
-                || format == DXGI_FORMAT_BC4_SNORM) ? 8 : 16;
-
-            assert(nbw == layout.Plane[0].MipLayout[level].WidthElements);
-            assert(nbh == layout.Plane[0].MipLayout[level].HeightElements);
-            assert(bpb == layout.Plane[0].BytesPerElement);
-
-            return TileByElement2D(images, nimages, level, computer, layout, xbox, bpb, nbw, nbh, false);
-        }
-        else if (IsPacked(format))
-        {
-            const size_t bpp = (BitsPerPixel(format) + 7) / 8;
-
-            // XG (XboxOne) incorrectly returns 2 instead of 4 here for layout.Plane[0].BytesPerElement
-
-            const size_t w = images[0]->width;
-            const size_t h = images[0]->height;
-            assert(((w + 1) / 2) == layout.Plane[0].MipLayout[level].WidthElements);
-            assert(h == layout.Plane[0].MipLayout[level].HeightElements);
-
-            return TileByElement2D(images, nimages, level, computer, layout, xbox, bpp, w, h, true);
-        }
-        else if (byelement)
-        {
-            //--- Typeless is done with per-element copy ----------------------------------
-            const size_t bpp = (BitsPerPixel(format) + 7) / 8;
-            assert(bpp == layout.Plane[0].BytesPerElement);
-
-            const size_t w = images[0]->width;
-            const size_t h = images[0]->height;
-
-            assert(w == layout.Plane[0].MipLayout[level].WidthElements);
-            assert(h == layout.Plane[0].MipLayout[level].HeightElements);
-
-            return TileByElement2D(images, nimages, level, computer, layout, xbox, bpp, w, h, false);
-        }
-        else
-        {
-            //--- Standard format handling ------------------------------------------------
-            auto& mip = layout.Plane[0].MipLayout[level];
-
-            const UINT32 tiledPixels = mip.PaddedWidthElements * mip.PaddedHeightElements * mip.PaddedDepthOrArraySize;
-
-            auto scanline = make_AlignedArrayXMVECTOR(images[0]->width + tiledPixels);
-
-            XMVECTOR* row = scanline.get();
-            XMVECTOR* tiled = row + images[0]->width;
-
-        #ifdef _DEBUG
-            memset(row, 0xCD, sizeof(XMVECTOR) * images[0]->width);
-        #endif
-
-            memset(tiled, 0, sizeof(XMVECTOR) * tiledPixels);
-
-            // Perform tiling
-            for (uint32_t item = 0; item < nimages; ++item)
+        for (size_t item = 0; item < nimages; ++item)
         {
             const Image* img = images[item];
 
@@ -501,40 +306,18 @@ namespace
             assert(img->rowPitch == images[0]->rowPitch);
             assert(img->format == images[0]->format);
 
-                auto sptr = reinterpret_cast<const uint8_t * __restrict>(img->pixels);
-                for (uint32_t y = 0; y < img->height; ++y)
+            HRESULT hr = computer->CopyIntoSubresource(
+                baseAddr,
+                0u,
+                metadata.CalculateSubresource(level, item),
+                img->pixels,
+                static_cast<UINT32>(img->rowPitch),
+                0u);
+            if (FAILED(hr))
             {
-                    if (!LoadScanline(row, img->width, sptr, img->rowPitch, img->format))
-                        return E_FAIL;
-
-                    sptr += img->rowPitch;
-
-                    for (size_t x = 0; x < img->width; ++x)
-                    {
-                    #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-                        size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, y, item, 0, nullptr);
-                    #else
-                        size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, y, item, 0);
-                    #endif
-                        if (offset == size_t(-1))
-                            return E_FAIL;
-
-                        assert(offset >= mip.OffsetBytes);
-                        assert(offset < mip.OffsetBytes + mip.SizeBytes);
-
-                        offset = (offset - mip.OffsetBytes) / layout.Plane[0].BytesPerElement;
-                        assert(offset < tiledPixels);
-
-                        tiled[offset] = row[x];
+                return hr;
             }
         }
-            }
-
-            // Store tiled texture
-            assert(mip.OffsetBytes + mip.SizeBytes <= layout.SizeBytes);
-            if (!StoreScanline(xbox.GetPointer() + mip.OffsetBytes, mip.SizeBytes, xbox.GetMetadata().format, tiled, tiledPixels))
-                return E_FAIL;
-        }
 
         return S_OK;
     }
@@ -546,149 +329,22 @@ namespace
     HRESULT Tile3D(
         const Image& image,
         uint32_t level,
-        uint32_t slices,
         _In_ XGTextureAddressComputer* computer,
-        const XG_RESOURCE_LAYOUT& layout,
         const XboxImage& xbox)
     {
         if (!image.pixels || !computer || !xbox.GetPointer())
             return E_POINTER;
 
-        assert(slices > 0);
+        uint8_t* baseAddr = xbox.GetPointer();
+        const auto& metadata = xbox.GetMetadata();
 
-        assert(layout.Planes == 1);
-
-        assert(image.format == xbox.GetMetadata().format);
-
-    #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-        const bool byelement = true;
-    #else
-        const bool byelement = IsTypeless(image.format);
-    #endif
-
-        if (IsCompressed(image.format))
-        {
-            //--- BC formats use per-block copy -------------------------------------------
-            const size_t nbw = std::max<size_t>(1, (image.width + 3) / 4);
-            const size_t nbh = std::max<size_t>(1, (image.height + 3) / 4);
-
-            const size_t bpb = (image.format == DXGI_FORMAT_BC1_TYPELESS
-                || image.format == DXGI_FORMAT_BC1_UNORM
-                || image.format == DXGI_FORMAT_BC1_UNORM_SRGB
-                || image.format == DXGI_FORMAT_BC4_TYPELESS
-                || image.format == DXGI_FORMAT_BC4_UNORM
-                || image.format == DXGI_FORMAT_BC4_SNORM) ? 8 : 16;
-
-            assert(nbw == layout.Plane[0].MipLayout[level].WidthElements);
-            assert(nbh == layout.Plane[0].MipLayout[level].HeightElements);
-            assert(bpb == layout.Plane[0].BytesPerElement);
-
-            return TileByElement3D(image, level, slices, computer, layout, xbox, bpb, nbw, nbh, false);
-        }
-        else if (IsPacked(image.format))
-        {
-            const size_t bpp = (BitsPerPixel(image.format) + 7) / 8;
-
-            // XG (XboxOne) incorrectly returns 2 instead of 4 here for layout.Plane[0].BytesPerElement
-
-            assert(((image.width + 1) / 2) == layout.Plane[0].MipLayout[level].WidthElements);
-            assert(image.height == layout.Plane[0].MipLayout[level].HeightElements);
-
-            return TileByElement3D(image, level, slices, computer, layout, xbox, bpp, image.width, image.height, true);
-        }
-        else if (byelement)
-        {
-            //--- Typeless is done with per-element copy ----------------------------------
-            const size_t bpp = (BitsPerPixel(image.format) + 7) / 8;
-            assert(bpp == layout.Plane[0].BytesPerElement);
-
-            assert(image.width == layout.Plane[0].MipLayout[level].WidthElements);
-            assert(image.height == layout.Plane[0].MipLayout[level].HeightElements);
-
-            return TileByElement3D(image, level, slices, computer, layout, xbox, bpp, image.width, image.height, false);
-        }
-        else
-        {
-            //--- Standard format handling ------------------------------------------------
-            auto& mip = layout.Plane[0].MipLayout[level];
-
-            const UINT32 tiledPixels = mip.PaddedWidthElements * mip.PaddedHeightElements * mip.PaddedDepthOrArraySize;
-            assert(tiledPixels >= (image.width * image.height * slices));
-
-            auto scanline = make_AlignedArrayXMVECTOR(image.width + tiledPixels);
-
-            XMVECTOR* row = scanline.get();
-            XMVECTOR* tiled = row + image.width;
-
-        #ifdef _DEBUG
-            memset(row, 0xCD, sizeof(XMVECTOR) * image.width);
-        #endif
-
-            memset(tiled, 0, sizeof(XMVECTOR) * tiledPixels);
-
-            // Perform tiling
-            const uint8_t* sptr = reinterpret_cast<const uint8_t*>(image.pixels);
-            for (uint32_t z = 0; z < slices; ++z)
-            {
-                const uint8_t* rptr = sptr;
-
-                for (uint32_t y = 0; y < image.height; ++y)
-                {
-                    if (!LoadScanline(row, image.width, rptr, image.rowPitch, image.format))
-                        return E_FAIL;
-
-                    rptr += image.rowPitch;
-
-                    for (size_t x = 0; x < image.width; ++x)
-                    {
-                    #if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
-                        size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, y, z, 0, nullptr);
-                    #else
-                        size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, y, z, 0);
-                    #endif
-                        if (offset == size_t(-1))
-                            return E_FAIL;
-
-                        assert(offset >= mip.OffsetBytes);
-                        assert(offset < mip.OffsetBytes + mip.SizeBytes);
-
-                        offset = (offset - mip.OffsetBytes) / layout.Plane[0].BytesPerElement;
-                        assert(offset < tiledPixels);
-
-                        tiled[offset] = row[x];
-                    }
-                }
-
-                sptr += image.slicePitch;
-            }
-
-            // Store tiled texture
-            uint8_t* dptr = xbox.GetPointer() + mip.OffsetBytes;
-            const uint8_t* endPtr = dptr + mip.SizeBytes;
-            const XMVECTOR* tptr = tiled;
-            for (uint32_t z = 0; z < mip.PaddedDepthOrArraySize; ++z)
-            {
-                uint8_t* rptr = dptr;
-                const XMVECTOR* uptr = tptr;
-
-                for (uint32_t y = 0; y < mip.PaddedHeightElements; ++y)
-                {
-                    if ((rptr + mip.PitchBytes) > endPtr)
-                        return E_FAIL;
-
-                    if (!StoreScanline(rptr, mip.PitchBytes, xbox.GetMetadata().format, uptr, mip.PitchPixels))
-                        return E_FAIL;
-
-                    rptr += mip.PitchBytes;
-                    uptr += mip.PaddedWidthElements;
-                }
-
-                dptr += mip.Slice2DSizeBytes;
-                tptr += size_t(mip.PaddedHeightElements) * size_t(mip.PaddedWidthElements);
-            }
-        }
-
-        return S_OK;
+        return computer->CopyIntoSubresource(
+            baseAddr,
+            0u,
+            metadata.CalculateSubresource(level, 0),
+            image.pixels,
+            static_cast<UINT32>(image.rowPitch),
+            static_cast<UINT32>(image.slicePitch));
     }
 }
 
@@ -766,7 +422,7 @@ HRESULT Xbox::Tile(
         return hr;
 
     const Image* images = &srcImage;
-    hr = Tile2D(&images, 1, 0, computer.Get(), layout, xbox);
+    hr = Tile2D(&images, 1, 0, computer.Get(), xbox);
     if (FAILED(hr))
     {
         xbox.Release();
@@ -788,15 +444,39 @@ HRESULT Xbox::Tile(
     XboxImage& xbox,
     XboxTileMode mode)
 {
-    if (!srcImages
-        || !nimages
-        || metadata.width > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION
-        || metadata.height > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION
-        || metadata.depth > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION
-        || metadata.arraySize > D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION
-        || metadata.mipLevels > D3D11_REQ_MIP_LEVELS)
+    if (!srcImages || !nimages || nimages > UINT32_MAX)
         return E_INVALIDARG;
 
+    switch (metadata.dimension)
+    {
+    case TEX_DIMENSION_TEXTURE1D:
+        if (metadata.width > D3D11_REQ_TEXTURE1D_U_DIMENSION
+            || metadata.mipLevels > D3D11_REQ_MIP_LEVELS
+            || metadata.arraySize > D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION)
+            return E_INVALIDARG;
+        break;
+
+    case TEX_DIMENSION_TEXTURE2D:
+        if (metadata.width > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION
+            || metadata.height > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION
+            || metadata.mipLevels > D3D11_REQ_MIP_LEVELS
+            || metadata.arraySize > D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION)
+            return E_INVALIDARG;
+        break;
+
+    case TEX_DIMENSION_TEXTURE3D:
+        if (metadata.width > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION
+            || metadata.height > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION
+            || metadata.depth > D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION
+            || metadata.mipLevels > D3D11_REQ_MIP_LEVELS
+            || metadata.arraySize != 1)
+            return E_INVALIDARG;
+        break;
+
+    default:
+        return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+    }
+
     xbox.Release();
 
     if (metadata.format == DXGI_FORMAT_R1_UNORM
@@ -877,13 +557,13 @@ HRESULT Xbox::Tile(
             if (FAILED(hr))
                 return hr;
 
-            for (uint32_t level = 0; level < metadata.mipLevels; ++level)
+            for (size_t level = 0; level < metadata.mipLevels; ++level)
             {
                 if (metadata.arraySize > 1)
                 {
                     std::vector<const Image*> images;
                     images.reserve(metadata.arraySize);
-                    for (uint32_t item = 0; item < metadata.arraySize; ++item)
+                    for (size_t item = 0; item < metadata.arraySize; ++item)
                     {
                         const size_t index = metadata.ComputeIndex(level, item, 0);
                         if (index >= nimages)
@@ -895,7 +575,7 @@ HRESULT Xbox::Tile(
                         images.push_back(&srcImages[index]);
                     }
 
-                    hr = Tile1D(&images[0], images.size(), level, computer.Get(), layout, xbox);
+                    hr = Tile1D(&images[0], images.size(), static_cast<uint32_t>(level), computer.Get(), layout, xbox);
                 }
                 else
                 {
@@ -907,7 +587,7 @@ HRESULT Xbox::Tile(
                     }
 
                     const Image* images = &srcImages[index];
-                    hr = Tile1D(&images, 1, level, computer.Get(), layout, xbox);
+                    hr = Tile1D(&images, 1, static_cast<uint32_t>(level), computer.Get(), layout, xbox);
                 }
 
                 if (FAILED(hr))
@@ -961,13 +641,13 @@ HRESULT Xbox::Tile(
             if (FAILED(hr))
                 return hr;
 
-            for (uint32_t level = 0; level < metadata.mipLevels; ++level)
+            for (size_t level = 0; level < metadata.mipLevels; ++level)
             {
                 if (metadata.arraySize > 1)
                 {
                     std::vector<const Image*> images;
                     images.reserve(metadata.arraySize);
-                    for (uint32_t item = 0; item < metadata.arraySize; ++item)
+                    for (size_t item = 0; item < metadata.arraySize; ++item)
                     {
                         const size_t index = metadata.ComputeIndex(level, item, 0);
                         if (index >= nimages)
@@ -979,7 +659,7 @@ HRESULT Xbox::Tile(
                         images.push_back(&srcImages[index]);
                     }
 
-                    hr = Tile2D(&images[0], images.size(), level, computer.Get(), layout, xbox);
+                    hr = Tile2D(&images[0], images.size(), static_cast<uint32_t>(level), computer.Get(), xbox);
                 }
                 else
                 {
@@ -991,7 +671,7 @@ HRESULT Xbox::Tile(
                     }
 
                     const Image* images = &srcImages[index];
-                    hr = Tile2D(&images, 1, level, computer.Get(), layout, xbox);
+                    hr = Tile2D(&images, 1, static_cast<uint32_t>(level), computer.Get(), xbox);
                 }
 
                 if (FAILED(hr))
@@ -1043,10 +723,10 @@ HRESULT Xbox::Tile(
             if (FAILED(hr))
                 return hr;
 
-            uint32_t d = static_cast<uint32_t>(metadata.depth);
+            auto d = static_cast<uint32_t>(metadata.depth);
 
             size_t index = 0;
-            for (uint32_t level = 0; level < metadata.mipLevels; ++level)
+            for (size_t level = 0; level < metadata.mipLevels; ++level)
             {
                 if ((index + d) > nimages)
                 {
@@ -1055,7 +735,7 @@ HRESULT Xbox::Tile(
                 }
 
                 // Relies on the fact that slices are contiguous
-                hr = Tile3D(srcImages[index], level, d, computer.Get(), layout, xbox);
+                hr = Tile3D(srcImages[index], static_cast<uint32_t>(level), computer.Get(), xbox);
                 if (FAILED(hr))
                 {
                     xbox.Release();

CHANGELOG.md

@@ -6,6 +6,63 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
 
 ## Release History
 
+### March 24, 2025
+* C++17 `std::byte` support for `FromMemory` functions
+* Added **ComputeTileShape** method to compute Direct3D Tiled Resource standard dimensions
+* Added *isd3d12* defaulted parameter to `IsPlaner` for change to depth/stencil formats
+* DDS reader `DDS_FLAGS_PERMISSIVE` supports a DX10 variant with 'incorrect' cubemap counts
+* Retired support for Windows 7 and Windows 8.0
+* CMake project updates including support for BUILD_SHARED_LIBS (i.e. DLL vs. static library)
+* texconv:
+  * Add `--ignore-srgb` switch which passes `TGA_FLAGS_IGNORE_SRGB` or `WIC_FLAGS_IGNORE_SRGB`
+  * Add `--wic-uncompressed` switch which applies to TIFF and HEIF
+  * Updates for `--wic-lossless` (JPEG-XR only) and `--wic-quality` (also applies to HEIF) switches
+  * The `--ignore-mips` switch now properly blocks use on array textures
+  * Remove 'heic' file extension for writing which is only supported for reading by *HEIF Image Extensions*
+  * Add support for 'phm' file extension to indicate Portable Half Map
+
+### 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
+* DDS reader will now load legacy 'mixed' channel formats as UNORM
+  * Uses x2bias for the signed channels
+  * `DDSPF_L6V5U5`, `DDSPF_X8L8V8U8`, `DDSPF_A2W10V10U10`
+* texconv: Added `-ignoremips` option to handle some invalid/truncated DDS files
+* EXR auxiliary reader returns 6 images for files with 'envmap' metadata
+* PNG auxiliary reader/writer fixed for single channel images (`DXGI_FORMAT_R8_UNORM`)
+* Xbox auxiliary now has **EncodeDDSHeader** function
+* ScreenGrab9 minor DDS header fix when writing A2W10V10U10 legacy mixed formats
+* CMake project updates including support for ARM64EC
+* Added GitHub Actions YAML files
+
+### June 4, 2024
+* Fix for HDR codec to avoid buffer overread for some malformed files
+* Updated D3DX12 internal copy with latest changes from DirectX-Headers GitHub
+* CMake project updates
+* Retired VS 2019 projects for the UWP platform
+
+### March 6, 2024
+* Xbox Auxiliary tiling/detiling code optimization
+
+### February 21, 2024
+* TGA reader now limited to 4 GB for maximum image size for security hardening
+* Project updates for improved logging of shader compilation errors and GDK validation
+* CMake project updates and refactor
+* Minor code review for Clang, MinGW, and Intel compilers
+* Auxiliary updated with LIBJPEG and LIBPNG implementations for use on WSL which lacks WIC
+* texassemble: new ``from-mips`` command
+* texconv: Updated to support Xbox extension functionality
+
 ### December 31, 2023
 * TGA reader bug fix for offset boundary check
 * PPM/PFM reader bug fixes for bounds checking
@@ -19,11 +76,11 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
   * 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
+* 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
+* **CompressEx** and **ConvertEx** functions added with status callback and options structs
 * Added optional ``DDSMetaData`` return for Ex versions of DDS loader functions
 * Added ``TEX_ALPHA_WEIGHT_DEFAULT`` constant (set to 1.0)
 * DDS reader updated to support variant used by *Unreal Tournament 2004*
@@ -78,7 +135,7 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
 * Code review
 
 ### July 29, 2022
-* Added ``MakeLinear`` DXGI_FORMAT utility function.
+* Added **MakeLinear** DXGI_FORMAT utility function.
 * *breaking change* ``CreateTextureEx`` and ``CreateShaderResourceViewEx`` functions now use ``CREATETEX_FLAGS`` instead of a ``bool forceSRGB`` parameter.
 * Updates for MinGW ABI fixes for DirectX12 in the latest DirectX-Headers.
 * CMake and MSBuild project updates
@@ -87,7 +144,7 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
 
 ### May 9, 2022
 * TGA reader updated to support 24-bit paletted uncompressed color-mapped images (used by a DCC application)
-* Added `IsBGR` utility method
+* Added **IsBGR** utility method
 * Workaround for driver issue on some systems using DirectX 11 `Capture` method
 * Fix for problem with resizing/mipmaps generation for HDR content using box/fant filter which should avoid going through WIC code paths
 * Minor updates for VS 2022 (17.2)
@@ -108,6 +165,7 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
 * Optional C++17 usage in a few places
 
 ### February 28, 2022
+* Made **EncodeDDSHeader** a public function instead of being internal only
 * Updated D3DX12 internal copy with latest changes from GitHub
 * Code and project review including fixing clang v13 warnings
 * Added CMakePresets.json
@@ -175,7 +233,7 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
 
 ### August 15, 2020
 * Added ``DDS_FLAGS_ALLOW_LARGE_FILES`` flag for DDS loader to allow textures with dimensions that are too big for Direct3D
-* Added ``FormatDataType`` function
+* Added **FormatDataType** function
 * Fixed bug with DX12 ``Capture`` with 'small alignment' textures
 * Code review and project updates
 * Added GDK projects
@@ -193,7 +251,7 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
 
 ### June 1, 2020
 * Converted to typed enum bitmask flags (see release notes for details on this potential *breaking change*)
-  + **ComputePitch**, **xxxDDSxxx**, **xxxWICxxx**, **FlipRotate**, **Resize**, **Convert**, **GenerateMipMaps**, **GenerateMipMaps3D**, **PremultiplyAlpha**, **Compress**, **ComputeNormalMap**, **CopyRectangle**, **ComputeMSE**
+  * **ComputePitch**, **xxxDDSxxx**, **xxxWICxxx**, **FlipRotate**, **Resize**, **Convert**, **GenerateMipMaps**, **GenerateMipMaps3D**, **PremultiplyAlpha**, **Compress**, **ComputeNormalMap**, **CopyRectangle**, **ComputeMSE**
 * ``WIC_FLAGS_DEFAULT_SRGB`` / ``WIC_LOADER_SRGB_DEFAULT`` flag added when loading image via WIC without explicit colorspace metadata
 * WIC loader for  ``PNG`` codec now checks ``gAMA`` chunk to determine colorspace if the ``sRGB`` chunk is not found for legacy sRGB detection.
 * Fixed conformance issues when using ``/Zc:preprocessor``
@@ -506,9 +564,9 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
 
 ### June 15, 2013
 * Custom filtering implementation for **Resize** & **GenerateMipMaps(3D)** - Point, Box, Linear, Cubic, and Triangle
-  + ``TEX_FILTER_TRIANGLE`` finite low-pass triangle filter
-  + ``TEX_FILTER_WRAP``, ``TEX_FILTER_MIRROR`` texture semantics for custom filtering
-  + ``TEX_FILTER_BOX`` alias for ``TEX_FILTER_FANT WIC``
+  * ``TEX_FILTER_TRIANGLE`` finite low-pass triangle filter
+  * ``TEX_FILTER_WRAP``, ``TEX_FILTER_MIRROR`` texture semantics for custom filtering
+  * ``TEX_FILTER_BOX`` alias for ``TEX_FILTER_FANT WIC``
 * Ordered and error diffusion dithering for non-WIC conversion
 * sRGB gamma correct custom filtering and conversion
 * ``DDS_FLAGS_EXPAND_LUMINANCE`` - Reader conversion option for L8, L16, and A8L8 legacy DDS files

CMakeLists.txt

@@ -3,9 +3,9 @@
 
 cmake_minimum_required (VERSION 3.20)
 
-set(DIRECTXTEX_VERSION 2.0.2)
+set(DIRECTXTEX_VERSION 2.0.7)
 
-if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
+if(XBOX_CONSOLE_TARGET STREQUAL "durango")
   set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
 endif()
 
@@ -15,12 +15,18 @@ project (DirectXTex
   HOMEPAGE_URL "https://go.microsoft.com/fwlink/?LinkId=248926"
   LANGUAGES CXX)
 
+if(DEFINED XBOX_CONSOLE_TARGET)
+  set(CMAKE_CXX_STANDARD_LIBRARIES "")
+endif()
+
 option(BUILD_TOOLS "Build tex command-line tools" ON)
 
-option(BUILD_SAMPLE "Build DDSView sample" ON)
+option(BUILD_SHARED_LIBS "Build DirectXTex as a shared library" OFF)
+
+option(BUILD_SAMPLE "Build DDSView sample (requires fxc.exe)" ON)
 
 # Includes the functions for Direct3D 11 resources and DirectCompute compression
-option(BUILD_DX11 "Build with DirectX11 Runtime support" ON)
+option(BUILD_DX11 "Build with DirectX11 Runtime support (requires fxc.exe)" ON)
 
 # Includes the functions for creating Direct3D 12 resources at runtime
 option(BUILD_DX12 "Build with DirectX12 Runtime support" ON)
@@ -39,6 +45,8 @@ option(DISABLE_MSVC_ITERATOR_DEBUGGING "Disable iterator debugging in Debug conf
 
 option(ENABLE_CODE_ANALYSIS "Use Static Code Analysis on build" OFF)
 
+option(ENABLE_CODE_COVERAGE "Build with code-coverage" OFF)
+
 option(USE_PREBUILT_SHADERS "Use externally built HLSL shaders" OFF)
 
 option(NO_WCHAR_T "Use legacy wide-character as unsigned short" OFF)
@@ -48,25 +56,19 @@ option(BUILD_FUZZING "Build for fuzz testing" OFF)
 # Includes the functions for loading/saving OpenEXR files at runtime
 option(ENABLE_OPENEXR_SUPPORT "Build with OpenEXR support" OFF)
 
+# See https://www.ijg.org/
+option(ENABLE_LIBJPEG_SUPPORT "Build with libjpeg support" OFF)
+
+# See http://www.libpng.org/pub/png/libpng.html
+option(ENABLE_LIBPNG_SUPPORT "Build with libpng support" OFF)
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
-
-if(DEFINED VCPKG_TARGET_ARCHITECTURE)
-    set(DIRECTX_ARCH ${VCPKG_TARGET_ARCHITECTURE})
-elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$")
-    set(DIRECTX_ARCH x86)
-elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Xx]64$")
-    set(DIRECTX_ARCH x64)
-elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]$")
-    set(DIRECTX_ARCH arm)
-elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]64$")
-    set(DIRECTX_ARCH arm64)
-endif()
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
    set(BUILD_DX12 ON)
@@ -74,11 +76,17 @@ if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
    set(BUILD_SAMPLE OFF)
 endif()
 
-if(DEFINED XBOX_CONSOLE_TARGET)
+if((DEFINED XBOX_CONSOLE_TARGET) AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
   set(BUILD_DX11 OFF)
 endif()
 
 include(GNUInstallDirs)
+include(build/CompilerAndLinker.cmake)
+
+if((DEFINED DIRECTX_ARCH) AND (${DIRECTX_ARCH} STREQUAL "arm64ec"))
+  # OpenEXR doesn't support ARM64EC
+  set(ENABLE_OPENEXR_SUPPORT OFF)
+endif()
 
 #--- Library
 set(LIBRARY_HEADERS
@@ -148,11 +156,11 @@ elseif((BUILD_XBOX_EXTS_XBOXONE OR BUILD_XBOX_EXTS_SCARLETT) AND WIN32)
        Auxiliary/DirectXTexXboxTile.cpp)
 endif()
 
-set(SHADER_SOURCES
+if(BUILD_DX11 AND WIN32 AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
+    set(SHADER_SOURCES
         DirectXTex/Shaders/BC6HEncode.hlsl
         DirectXTex/Shaders/BC7Encode.hlsl)
 
-if(BUILD_DX11 AND WIN32)
     list(APPEND LIBRARY_SOURCES
         DirectXTex/BCDirectCompute.h
         DirectXTex/BCDirectCompute.cpp
@@ -164,7 +172,7 @@ if(BUILD_DX12)
    list(APPEND LIBRARY_SOURCES DirectXTex/DirectXTexD3D12.cpp)
 
    if(NOT (DEFINED XBOX_CONSOLE_TARGET))
-       list(APPEND LIBRARY_SOURCES DirectXTex/d3dx12.h)
+       list(APPEND LIBRARY_SOURCES Common/d3dx12.h)
    endif()
 endif()
 
@@ -173,7 +181,23 @@ if(ENABLE_OPENEXR_SUPPORT)
    list(APPEND LIBRARY_SOURCES Auxiliary/DirectXTexEXR.cpp)
 endif()
 
-if(BUILD_DX11 AND WIN32)
+if(ENABLE_LIBJPEG_SUPPORT)
+    if(WIN32)
+        message(STATUS "Use of the Windows Imaging Component (WIC) instead of libjpeg is recommended.")
+    endif()
+    list(APPEND LIBRARY_HEADERS Auxiliary/DirectXTexJPEG.h)
+    list(APPEND LIBRARY_SOURCES Auxiliary/DirectXTexJPEG.cpp)
+endif()
+
+if(ENABLE_LIBPNG_SUPPORT)
+    if(WIN32)
+        message(STATUS "Use of the Windows Imaging Component (WIC) instead of libpng is recommended.")
+    endif()
+    list(APPEND LIBRARY_HEADERS Auxiliary/DirectXTexPNG.h)
+    list(APPEND LIBRARY_SOURCES Auxiliary/DirectXTexPNG.cpp)
+endif()
+
+if(BUILD_DX11 AND WIN32 AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
     if(NOT COMPILED_SHADERS)
         if(USE_PREBUILT_SHADERS)
             message(FATAL_ERROR "ERROR: Using prebuilt shaders requires the COMPILED_SHADERS variable is set")
@@ -187,18 +211,43 @@ if(BUILD_DX11 AND WIN32)
     list(APPEND LIBRARY_SOURCES ${COMPILED_SHADERS}/BC6HEncode_EncodeBlockCS.inc)
 
     if(NOT USE_PREBUILT_SHADERS)
+        find_program(DIRECTX_FXC_TOOL FXC.EXE
+          HINTS "C:/Program Files (x86)/Windows Kits/10/bin/${CMAKE_SYSTEM_VERSION}/${DIRECTX_HOST_ARCH}"
+                "C:/Program Files (x86)/Windows Kits/10/bin/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/${DIRECTX_HOST_ARCH}")
+        message(STATUS "Using LegacyShaderCompiler found in ${DIRECTX_FXC_TOOL}")
         add_custom_command(
             OUTPUT "${COMPILED_SHADERS}/BC6HEncode_EncodeBlockCS.inc"
             MAIN_DEPENDENCY "${PROJECT_SOURCE_DIR}/DirectXTex/Shaders/CompileShaders.cmd"
             DEPENDS ${SHADER_SOURCES}
             COMMENT "Generating HLSL shaders..."
-            COMMAND ${CMAKE_COMMAND} -E env CompileShadersOutput="${COMPILED_SHADERS}" CompileShaders.cmd > "${COMPILED_SHADERS}/compileshaders.log"
+            COMMAND ${CMAKE_COMMAND} -E env CompileShadersOutput="${COMPILED_SHADERS}" $<$<BOOL:${DIRECTX_FXC_TOOL}>:LegacyShaderCompiler=${DIRECTX_FXC_TOOL}> CompileShaders.cmd > "${COMPILED_SHADERS}/compileshaders.log"
             WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/DirectXTex/Shaders"
             USES_TERMINAL)
     endif()
 endif()
 
-add_library(${PROJECT_NAME} STATIC ${LIBRARY_SOURCES} ${LIBRARY_HEADERS})
+if(WIN32 AND BUILD_SHARED_LIBS)
+  message(STATUS "Build library as a DLL")
+
+  configure_file(
+      "${CMAKE_CURRENT_SOURCE_DIR}/build/DirectXTex.rc.in"
+      "${CMAKE_CURRENT_BINARY_DIR}/DirectXTex.rc" @ONLY)
+
+  add_library(${PROJECT_NAME} SHARED ${LIBRARY_SOURCES} ${LIBRARY_HEADERS} "${CMAKE_CURRENT_BINARY_DIR}/DirectXTex.rc")
+
+  target_compile_definitions(${PROJECT_NAME} PRIVATE DIRECTX_TEX_EXPORT)
+  target_compile_definitions(${PROJECT_NAME} INTERFACE DIRECTX_TEX_IMPORT)
+
+  if(XBOX_CONSOLE_TARGET MATCHES "scarlett")
+    target_link_libraries(${PROJECT_NAME} PRIVATE xgameplatform.lib xg_xs.lib xmem.lib)
+  elseif(XBOX_CONSOLE_TARGET MATCHES "xboxone")
+    target_link_libraries(${PROJECT_NAME} PRIVATE xgameplatform.lib xg_x.lib xmem.lib)
+  elseif(XBOX_CONSOLE_TARGET MATCHES "durango")
+    target_link_libraries(${PROJECT_NAME} PRIVATE kernelx.lib xg_x.lib combase.lib)
+  endif()
+else()
+  add_library(${PROJECT_NAME} ${LIBRARY_SOURCES} ${LIBRARY_HEADERS})
+endif()
 
 if(BUILD_DX11 AND WIN32)
    target_include_directories(${PROJECT_NAME} PRIVATE ${COMPILED_SHADERS})
@@ -227,33 +276,78 @@ if(ENABLE_OPENEXR_SUPPORT)
 endif()
 
 if(BUILD_XBOX_EXTS_SCARLETT AND WIN32)
-    if (EXISTS "${GameDK_DIR}/GXDK/toolKit/include/gxdk.h")
+    if(EXISTS "${GameDK_DIR}/GXDK/toolKit/include/gxdk.h")
         message(STATUS "Building Xbox extensions for Xbox Series X|S")
-        target_compile_definitions(${PROJECT_NAME} PRIVATE _USE_GXDK _USE_SCARLETT)
-        target_include_directories(${PROJECT_NAME} PRIVATE ${GameDK_DIR}/GXDK/toolKit/include ${GameDK_DIR}/GXDK/toolKit/include/Scarlett)
+
+        add_library(Xbox::GDKX SHARED IMPORTED)
+        set_target_properties(Xbox::GDKX PROPERTIES
+            IMPORTED_LOCATION "${GameDK_DIR}/GXDK/bin/Scarlett/xg_xs.dll"
+            IMPORTED_IMPLIB "${GameDK_DIR}/GXDK/toolKit/lib/amd64/Scarlett/xg_xs.lib"
+            MAP_IMPORTED_CONFIG_MINSIZEREL ""
+            MAP_IMPORTED_CONFIG_RELWITHDEBINFO ""
+            INTERFACE_COMPILE_DEFINITIONS "_USE_GXDK;_USE_SCARLETT"
+            INTERFACE_INCLUDE_DIRECTORIES "${GameDK_DIR}/GXDK/toolKit/include;${GameDK_DIR}/GXDK/toolKit/include/Scarlett")
+
+        target_compile_definitions(${PROJECT_NAME} PRIVATE USE_XBOX_EXTS)
+        target_link_libraries(${PROJECT_NAME} PUBLIC Xbox::GDKX)
     else()
         message(FATAL_ERROR "Building Xbox extensions requires GameDKLatest")
     endif()
 elseif(BUILD_XBOX_EXTS_XBOXONE AND WIN32)
-    if (EXISTS "${GameDK_DIR}/GXDK/toolKit/include/gxdk.h")
+    if(EXISTS "${GameDK_DIR}/GXDK/toolKit/include/gxdk.h")
         message(STATUS "Building Xbox extensions for XboxOne using the Microsoft GDK")
-        target_compile_definitions(${PROJECT_NAME} PRIVATE _USE_GXDK)
-        target_include_directories(${PROJECT_NAME} PRIVATE ${GameDK_DIR}/GXDK/toolKit/include ${GameDK_DIR}/GXDK/toolKit/include/XboxOne)
-    elseif (EXISTS "${XboxOneXDK_DIR}/PC/include/xdk.h")
+
+        add_library(Xbox::GDKX SHARED IMPORTED)
+        set_target_properties(Xbox::GDKX PROPERTIES
+            IMPORTED_LOCATION "${GameDK_DIR}/GXDK/bin/XboxOne/xg.dll"
+            IMPORTED_IMPLIB "${GameDK_DIR}/GXDK/toolKit/lib/amd64/XboxOne/xg.lib"
+            MAP_IMPORTED_CONFIG_MINSIZEREL ""
+            MAP_IMPORTED_CONFIG_RELWITHDEBINFO ""
+            INTERFACE_COMPILE_DEFINITIONS "_USE_GXDK"
+            INTERFACE_INCLUDE_DIRECTORIES "${GameDK_DIR}/GXDK/toolKit/include;${GameDK_DIR}/GXDK/toolKit/include/XboxOne")
+
+        target_compile_definitions(${PROJECT_NAME} PRIVATE USE_XBOX_EXTS)
+        target_link_libraries(${PROJECT_NAME} PUBLIC Xbox::GDKX)
+
+    elseif(EXISTS "${XboxOneXDK_DIR}/PC/include/xdk.h")
         message(STATUS "Building Xbox extensions for XboxOne using the Xbox One XDK")
-        target_include_directories(${PROJECT_NAME} PRIVATE ${XboxOneXDK_DIR}/PC/include)
+
+        add_library(Xbox::XDK SHARED IMPORTED)
+        set_target_properties(Xbox::XDK PROPERTIES
+            IMPORTED_LOCATION "${XboxOneXDK_DIR}/bin/xg.dll"
+            IMPORTED_IMPLIB "${XboxOneXDK_DIR}/PC/lib/amd64/xg.lib"
+            MAP_IMPORTED_CONFIG_MINSIZEREL ""
+            MAP_IMPORTED_CONFIG_RELWITHDEBINFO ""
+            INTERFACE_INCLUDE_DIRECTORIES "${XboxOneXDK_DIR}/PC/include")
+
+        target_compile_definitions(${PROJECT_NAME} PRIVATE USE_XBOX_EXTS)
+        target_link_libraries(${PROJECT_NAME} PUBLIC Xbox::XDK)
     else()
         message(FATAL_ERROR "Building Xbox extensions requires GameDKLatest or XboxOneXDKLatest")
     endif()
 endif()
 
+if(ENABLE_LIBJPEG_SUPPORT)
+  find_package(JPEG REQUIRED)
+  target_link_libraries(${PROJECT_NAME} PUBLIC JPEG::JPEG)
+endif()
+
+if(ENABLE_LIBPNG_SUPPORT)
+  find_package(PNG REQUIRED)
+  target_link_libraries(${PROJECT_NAME} PUBLIC PNG::PNG)
+endif()
+
 if(NOT MINGW)
     target_precompile_headers(${PROJECT_NAME} PRIVATE DirectXTex/DirectXTexP.h)
 endif()
 
 if(MINGW OR (NOT WIN32))
     find_package(directxmath CONFIG REQUIRED)
+    target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectXMath)
+
     find_package(directx-headers CONFIG REQUIRED)
+    target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectX-Headers)
+    target_compile_definitions(${PROJECT_NAME} PUBLIC USING_DIRECTX_HEADERS)
 else()
     find_package(directxmath CONFIG QUIET)
     find_package(directx-headers CONFIG QUIET)
@@ -261,50 +355,14 @@ endif()
 
 if(directxmath_FOUND)
     message(STATUS "Using DirectXMath package")
-    target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectXMath)
+    target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectXMath)
 endif()
 
 if(directx-headers_FOUND)
     message(STATUS "Using DirectX-Headers package")
-    target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectX-Headers)
-    target_compile_definitions(${PROJECT_NAME} PUBLIC USING_DIRECTX_HEADERS)
-endif()
-
-include(CheckIncludeFileCXX)
-
-if(DEFINED XBOX_CONSOLE_TARGET)
-    message(STATUS "Building for Xbox Console Target: ${XBOX_CONSOLE_TARGET}")
-    set(CMAKE_REQUIRED_QUIET ON)
-    if(XBOX_CONSOLE_TARGET STREQUAL "durango")
-        CHECK_INCLUDE_FILE_CXX(xdk.h XDKLegacy_HEADER)
-        if(NOT XDKLegacy_HEADER)
-            message(FATAL_ERROR "Legacy Xbox One XDK required to build for Durango.")
-        endif()
-        target_compile_definitions(${PROJECT_NAME} PUBLIC WINAPI_FAMILY=WINAPI_FAMILY_TV_TITLE _XBOX_ONE _TITLE MONOLITHIC=1)
-    else()
-        CHECK_INCLUDE_FILE_CXX(gxdk.h GXDK_HEADER)
-        if(NOT GXDK_HEADER)
-            message(FATAL_ERROR "Microsoft GDK with Xbox Extensions required to build for Xbox. See https://aka.ms/gdkx")
-        endif()
-        target_compile_definitions(${PROJECT_NAME} PUBLIC WINAPI_FAMILY=WINAPI_FAMILY_GAMES)
-        if(XBOX_CONSOLE_TARGET STREQUAL "scarlett")
-            CHECK_INCLUDE_FILE_CXX(d3d12_xs.h D3D12XS_HEADER)
-            if(NOT D3D12XS_HEADER)
-                message(FATAL_ERROR "Microsoft GDK with Xbox Extensions environment needs to be set for Xbox Series X|S.")
-            endif()
-            target_compile_definitions(${PROJECT_NAME} PUBLIC _GAMING_XBOX _GAMING_XBOX_SCARLETT)
-        elseif(XBOX_CONSOLE_TARGET STREQUAL "xboxone")
-            CHECK_INCLUDE_FILE_CXX(d3d12_x.h D3D12X_HEADER)
-            if(NOT D3D12X_HEADER)
-                message(FATAL_ERROR "Microsoft GDK with Xbox Extensions environment needs to be set for Xbox One.")
-            endif()
-            target_compile_definitions(${PROJECT_NAME} PUBLIC _GAMING_XBOX _GAMING_XBOX_XBOXONE)
-        else()
-            message(FATAL_ERROR "Unknown XBOX_CONSOLE_TARGET")
-        endif()
-    endif()
-elseif(WINDOWS_STORE)
-    target_compile_definitions(${PROJECT_NAME} PUBLIC WINAPI_FAMILY=WINAPI_FAMILY_APP)
+    target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectX-Headers)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE USING_DIRECTX_HEADERS)
+    target_compile_options(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC,Intel>:/wd4062> $<$<CXX_COMPILER_ID:Clang,IntelLLVM>:-Wno-switch-enum>)
 endif()
 
 #--- Package
@@ -356,6 +414,13 @@ endif()
 if(directx-headers_FOUND)
   list(APPEND DIRECTXTEX_DEP_L "DirectX-Headers")
 endif()
+if(ENABLE_LIBJPEG_SUPPORT AND JPEG_FOUND)
+  list(APPEND DIRECTXTEX_DEP_L "libjpeg")
+endif()
+if(ENABLE_LIBPNG_SUPPORT AND PNG_FOUND)
+  list(APPEND DIRECTXTEX_DEP_L "libpng")
+endif()
+
 list(LENGTH DIRECTXTEX_DEP_L DEP_L)
 if(DEP_L)
   STRING(REPLACE ";" ", " DIRECTXTEX_DEP " ${DIRECTXTEX_DEP_L}")
@@ -376,8 +441,10 @@ if(BUILD_TOOLS AND WIN32)
   add_executable(texassemble
     Texassemble/texassemble.cpp
     Texassemble/texassemble.rc
-    Texassemble/settings.manifest
+    Common/CmdLineHelpers.h
+    Common/settings.manifest
     Texassemble/AnimatedGif.cpp)
+  target_compile_features(texassemble PRIVATE cxx_std_17)
   target_link_libraries(texassemble PRIVATE ${PROJECT_NAME} ole32.lib version.lib)
   source_group(texassemble REGULAR_EXPRESSION Texassemble/*.*)
   list(APPEND TOOL_EXES texassemble)
@@ -387,68 +454,89 @@ if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
   add_executable(texconv
     Texconv/texconv.cpp
     Texconv/texconv.rc
-    Texconv/settings.manifest
+    Common/CmdLineHelpers.h
+    Common/settings.manifest
     Texconv/ExtendedBMP.cpp
     Texconv/PortablePixMap.cpp)
+  target_compile_features(texconv PRIVATE cxx_std_17)
   target_link_libraries(texconv PRIVATE ${PROJECT_NAME} ole32.lib shell32.lib version.lib)
   source_group(texconv REGULAR_EXPRESSION Texconv/*.*)
   list(APPEND TOOL_EXES texconv)
-
-  if(BC_USE_OPENMP)
-    target_link_libraries(texconv PRIVATE OpenMP::OpenMP_CXX)
-  endif()
 endif()
 
 if(BUILD_TOOLS AND WIN32)
   add_executable(texdiag
     Texdiag/texdiag.cpp
     Texdiag/texdiag.rc
-    Texdiag/settings.manifest)
+    Common/CmdLineHelpers.h
+    Common/settings.manifest)
+  target_compile_features(texdiag PRIVATE cxx_std_17)
   target_link_libraries(texdiag PRIVATE ${PROJECT_NAME} ole32.lib version.lib)
   source_group(texdiag REGULAR_EXPRESSION Texdiag/*.*)
   list(APPEND TOOL_EXES texdiag)
 endif()
 
+foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
+  target_include_directories(${t} PRIVATE Common)
+endforeach()
+
 if(BUILD_TOOLS AND WIN32)
   if(ENABLE_OPENEXR_SUPPORT)
     foreach(t IN LISTS TOOL_EXES)
       target_include_directories(${t} PRIVATE Auxiliary)
       target_link_libraries(${t} PRIVATE ${OPENEXR_ILMIMF_LIBRARY})
-      target_compile_options(${t} PRIVATE -DUSE_OPENEXR)
+      target_compile_definitions(${t} PRIVATE USE_OPENEXR)
     endforeach()
   endif()
+  if(ENABLE_LIBJPEG_SUPPORT)
+    foreach(t IN LISTS TOOL_EXES)
+      target_include_directories(${t} PRIVATE Auxiliary)
+      target_link_libraries(${t} PRIVATE JPEG::JPEG)
+      target_compile_definitions(${t} PRIVATE USE_LIBJPEG)
+    endforeach()
+  endif()
+  if(ENABLE_LIBPNG_SUPPORT)
+    foreach(t IN LISTS TOOL_EXES)
+      target_include_directories(${t} PRIVATE Auxiliary)
+      target_link_libraries(${t} PRIVATE PNG::PNG)
+      target_compile_definitions(${t} PRIVATE USE_LIBPNG)
+    endforeach()
+  endif()
+  if(BUILD_XBOX_EXTS_SCARLETT OR BUILD_XBOX_EXTS_XBOXONE)
+    target_include_directories(texconv PRIVATE Auxiliary)
+    target_compile_definitions(texconv PRIVATE USE_XBOX_EXTS)
+    target_link_libraries(texconv PUBLIC $<TARGET_NAME_IF_EXISTS:Xbox::GDKX> $<TARGET_NAME_IF_EXISTS:Xbox::XDK>)
+
+    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.21")
+      add_custom_command(TARGET texconv POST_BUILD
+          COMMAND ${CMAKE_COMMAND} -E copy
+          $<TARGET_RUNTIME_DLLS:texconv> $<TARGET_FILE_DIR:texconv>
+          COMMAND_EXPAND_LISTS
+          )
+    endif()
+  endif()
 endif()
 
 #--- DDSView sample
 if(BUILD_SAMPLE AND BUILD_DX11 AND WIN32)
   list(APPEND TOOL_EXES ddsview)
 
-  if(NOT COMPILED_DDSVIEW_SHADERS)
-      if(USE_PREBUILT_SHADERS)
-          message(FATAL_ERROR "ERROR: Using prebuilt shaders requires the COMPILED_DDSVIEW_SHADERS variable is set")
-      endif()
-      set(COMPILED_DDSVIEW_SHADERS ${CMAKE_CURRENT_BINARY_DIR}/Shaders/Compiled)
-      file(MAKE_DIRECTORY ${COMPILED_DDSVIEW_SHADERS})
-  else()
-      file(TO_CMAKE_PATH ${COMPILED_DDSVIEW_SHADERS} COMPILED_DDSVIEW_SHADERS)
-  endif()
-
   add_executable(ddsview WIN32
     DDSView/ddsview.cpp
     DDSView/ddsview.rc
-    ${COMPILED_DDSVIEW_SHADERS}/ddsview_ps1D.inc)
+    ${COMPILED_SHADERS}/ddsview_ps1D.inc)
   target_link_libraries(ddsview PRIVATE ${PROJECT_NAME} d3d11.lib ole32.lib)
   source_group(ddsview REGULAR_EXPRESSION DDSView/*.*)
 
-  target_include_directories(ddsview PRIVATE ${COMPILED_DDSVIEW_SHADERS})
+  target_include_directories(ddsview PRIVATE ${COMPILED_SHADERS})
 
   if(NOT USE_PREBUILT_SHADERS)
       add_custom_command(
-            OUTPUT "${COMPILED_DDSVIEW_SHADERS}/ddsview_ps1D.inc"
+            OUTPUT "${COMPILED_SHADERS}/ddsview_ps1D.inc"
             MAIN_DEPENDENCY "${PROJECT_SOURCE_DIR}/DDSView/hlsl.cmd"
-            DEPENDS "${PROJECT_SOURCE_DIR}/DDSView/ddsview.fx"
+            DEPENDS "DDSView/ddsview.hlsl"
             COMMENT "Generating HLSL shaders for DDSView..."
-            COMMAND COMMAND ${CMAKE_COMMAND} -E env CompileShadersOutput="${COMPILED_DDSVIEW_SHADERS}" hlsl.cmd > "${COMPILED_DDSVIEW_SHADERS}/hlsl.log"
+            COMMAND ${CMAKE_COMMAND} -E env CompileShadersOutput="${COMPILED_SHADERS}" $<$<BOOL:${DIRECTX_FXC_TOOL}>:LegacyShaderCompiler=${DIRECTX_FXC_TOOL}> hlsl.cmd > "${COMPILED_SHADERS}/hlsl_ddsview.log"
             WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/DDSView"
             USES_TERMINAL)
   endif()
@@ -460,81 +548,30 @@ if(directxmath_FOUND)
   endforeach()
 endif()
 
+if(TOOL_EXES)
+  message(STATUS "Building tools: ${TOOL_EXES}")
+endif()
+
 if(MSVC)
     foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-      target_compile_options(${t} PRIVATE /Wall /GR- /fp:fast "$<$<NOT:$<CONFIG:DEBUG>>:/guard:cf>")
-      target_link_options(${t} PRIVATE /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO)
+      target_compile_options(${t} PRIVATE /Wall /GR-)
     endforeach()
 
-    if((CMAKE_SIZEOF_VOID_P EQUAL 4) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
-      foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-        target_link_options(${t} PRIVATE /SAFESEH)
-      endforeach()
-    endif()
-
-    if(ENABLE_SPECTRE_MITIGATION
-       AND (MSVC_VERSION GREATER_EQUAL 1913)
-       AND (NOT WINDOWS_STORE)
-       AND (NOT ENABLE_OPENEXR_SUPPORT)
-       AND (NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")))
-      message(STATUS "Building Spectre-mitigated libraries")
-      foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-        target_compile_options(${t} PRIVATE "/Qspectre")
-      endforeach()
-    endif()
-
-    if((MSVC_VERSION GREATER_EQUAL 1924)
-       AND ((NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0)))
-      foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-        target_compile_options(${t} PRIVATE /ZH:SHA_256)
-      endforeach()
-    endif()
-
-    if((MSVC_VERSION GREATER_EQUAL 1928)
-       AND (CMAKE_SIZEOF_VOID_P EQUAL 8)
-       AND NOT ENABLE_OPENEXR_SUPPORT
-       AND ((NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)))
-      foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-        target_compile_options(${t} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
-        target_link_options(${t} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
-      endforeach()
-    endif()
-
     if(NO_WCHAR_T)
       message(STATUS "Using non-native wchar_t as unsigned short")
       foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
         target_compile_options(${t} PRIVATE "/Zc:wchar_t-")
       endforeach()
     endif()
-else()
-    foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-      target_compile_definitions(${t} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
-    endforeach()
 endif()
 
-if(XBOX_CONSOLE_TARGET STREQUAL "scarlett")
-    target_compile_options(${PROJECT_NAME} PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,/favor:AMD64 /arch:AVX2,-march=znver2>)
-elseif(XBOX_CONSOLE_TARGET MATCHES "(xboxone|durango)")
-    target_compile_options(${PROJECT_NAME} PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,/favor:AMD64 /arch:AVX,-march=btver2>)
-elseif(NOT (${DIRECTX_ARCH} MATCHES "^arm"))
-    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-        set(ARCH_SSE2 $<$<CXX_COMPILER_ID:MSVC>:/arch:SSE2> $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-msse2>)
-    else()
-        set(ARCH_SSE2 $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-msse2>)
-    endif()
+foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
+  target_compile_definitions(${t} PRIVATE ${COMPILER_DEFINES})
+  target_compile_options(${t} PRIVATE ${COMPILER_SWITCHES})
+  target_link_options(${t} PRIVATE ${LINKER_SWITCHES})
+endforeach()
 
-    foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-      target_compile_options(${t} PRIVATE ${ARCH_SSE2})
-    endforeach()
-endif()
-
-if(MINGW)
-    foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-      target_link_options(${t} PRIVATE -municode)
-    endforeach()
-endif()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM")
     set(WarningsLib -Wall -Wpedantic -Wextra)
 
     if((BUILD_XBOX_EXTS_XBOXONE OR BUILD_XBOX_EXTS_SCARLETT) AND WIN32)
@@ -549,73 +586,54 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     endif()
     target_compile_options(${PROJECT_NAME} PRIVATE ${WarningsLib})
 
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0)
-        list(APPEND WarningsLib "-Wno-unsafe-buffer-usage")
-    endif()
-    target_compile_options(${PROJECT_NAME} PRIVATE ${WarningsLib})
-
-    set(WarningsEXE ${WarningsLib} "-Wno-c++98-compat" "-Wno-c++98-compat-pedantic" "-Wno-switch" "-Wno-switch-enum" "-Wno-covered-switch-default" "-Wno-language-extension-token" "-Wno-missing-prototypes" "-Wno-global-constructors" "-Wno-double-promotion")
+    set(WarningsEXE ${WarningsLib} "-Wno-c++98-compat" "-Wno-c++98-compat-pedantic" "-Wno-switch" "-Wno-switch-enum" "-Wno-switch-default" "-Wno-covered-switch-default" "-Wno-language-extension-token" "-Wno-missing-prototypes" "-Wno-global-constructors" "-Wno-double-promotion")
     foreach(t IN LISTS TOOL_EXES)
       target_compile_options(${t} PRIVATE ${WarningsEXE})
     endforeach()
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-      target_compile_options(${t} PRIVATE -Wno-ignored-attributes)
+      target_compile_options(${t} PRIVATE "-Wno-ignored-attributes" "-Walloc-size-larger-than=4GB")
+
+      if(BUILD_SHARED_LIBS)
+        target_compile_options(${t} PRIVATE "-Wno-attributes")
+      endif()
     endforeach()
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+    set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 14)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-    foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-      target_compile_options(${t} PRIVATE /sdl /permissive- /JMC- /Zc:__cplusplus /Zc:inline)
-    endforeach()
+
+    if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.37)
+       AND (NOT (${DIRECTX_ARCH} MATCHES "^arm"))
+       AND ((${DIRECTX_ARCH} STREQUAL "x64") OR (CMAKE_SIZEOF_VOID_P EQUAL 8)))
+       # Enable since DirectXTex library has a lot of large switch statements
+      target_compile_options(${PROJECT_NAME} PRIVATE /jumptablerdata)
+    endif()
 
     if(ENABLE_CODE_ANALYSIS)
+      message(STATUS "Building with Code Analysis (PREFIX)")
       foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-        target_compile_options(${t} PRIVATE /analyze)
+        target_compile_options(${t} PRIVATE /analyze /WX)
       endforeach()
     endif()
 
-    if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
-      message(STATUS "Building using Whole Program Optimization")
+    if(ENABLE_SPECTRE_MITIGATION
+       AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.13)
+       AND (NOT ENABLE_OPENEXR_SUPPORT)
+       AND (NOT WINDOWS_STORE))
+        message(STATUS "Building Spectre-mitigated libraries")
         foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-        target_compile_options(${t} PRIVATE /Gy /Gw)
+          target_compile_options(${t} PRIVATE "/Qspectre")
         endforeach()
     endif()
 
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
+   if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
+      AND BUILD_XBOX_EXTS_XBOXONE)
         foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-          target_compile_options(${t} PRIVATE /Zc:preprocessor /wd5105)
-        endforeach()
-        if(BUILD_XBOX_EXTS_XBOXONE)
-            target_compile_options(${PROJECT_NAME} PRIVATE /wd5104 /wd5204)
-        endif()
-    endif()
-
-    if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
-        foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-          target_link_options(${t} PRIVATE /CETCOMPAT)
+          target_compile_options(${t} PRIVATE /wd5104 /wd5204)
         endforeach()
     endif()
 
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.28)
-        foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-          target_compile_options(${t} PRIVATE /Zc:lambda)
-        endforeach()
-    endif()
-
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.35)
-        foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-          target_compile_options(${t} PRIVATE /Zc:checkGwOdr $<$<VERSION_GREATER_EQUAL:${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION},10.0.22000>:/Zc:templateScope>)
-        endforeach()
-    endif()
-
-    if(BC_USE_OPENMP)
-        # OpenMP in MSVC is not compatible with /permissive unless you disable two-phase lookup
-        target_compile_options(${PROJECT_NAME} PRIVATE /Zc:twoPhase-)
-        if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
-          target_compile_options(texconv PRIVATE /Zc:twoPhase-)
-        endif()
-    endif()
-
-    set(WarningsEXE "/wd4061" "/wd4062" "/wd4365" "/wd4514" "/wd4625" "/wd4626" "/wd4627" "/wd4668" "/wd4710" "/wd4711" "/wd4751" "/wd4820" "/wd5026" "/wd5027" "/wd5039" "/wd5045" "/wd5219")
+    set(WarningsEXE "/wd4061" "/wd4062" "/wd4365" "/wd4514" "/wd4571" "/wd4625" "/wd4626" "/wd4627" "/wd4668" "/wd4710" "/wd4711" "/wd4751" "/wd4774" "/wd4820" "/wd5026" "/wd5027" "/wd5039" "/wd5045" "/wd5219")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34)
       list(APPEND WarningsEXE "/wd5262" "/wd5264")
     endif()
@@ -623,16 +641,21 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
       target_compile_options(${t} PRIVATE ${WarningsEXE})
     endforeach()
 
-    if (BUILD_FUZZING AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.32)
+    if(BUILD_FUZZING AND (NOT WINDOWS_STORE))
+      string(REPLACE "/DNDEBUG" "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
+      string(REPLACE "/DNDEBUG" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
+
+      if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.32)
         foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-           target_compile_options(${t} PRIVATE /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div)
-           target_link_libraries(${t} PRIVATE sancov.lib)
+          target_compile_options(${t} PRIVATE ${ASAN_SWITCHES})
+          target_link_libraries(${t} PRIVATE ${ASAN_LIBS})
         endforeach()
       endif()
+    endif()
 endif()
 
 if(WIN32)
-    if (XBOX_CONSOLE_TARGET STREQUAL "durango")
+    if(XBOX_CONSOLE_TARGET STREQUAL "durango")
         set(WINVER 0x0602)
     elseif(BUILD_DX12 OR (${DIRECTX_ARCH} MATCHES "^arm64"))
         message(STATUS "Building with DirectX 12 Runtime support")
@@ -640,13 +663,12 @@ if(WIN32)
     elseif(${DIRECTX_ARCH} MATCHES "^arm")
         set(WINVER 0x0602)
     else()
-        message(STATUS "Building with Windows 7 compatibility")
-        set(WINVER 0x0601)
-        target_compile_definitions(${PROJECT_NAME} PRIVATE _WIN7_PLATFORM_UPDATE)
+        message(STATUS "Building with Windows 8.1 compatibility")
+        set(WINVER 0x0603)
     endif()
 
     foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
-      target_compile_definitions(${t} PRIVATE _UNICODE UNICODE _WIN32_WINNT=${WINVER})
+      target_compile_definitions(${t} PRIVATE _WIN32_WINNT=${WINVER})
     endforeach()
 
     if(DISABLE_MSVC_ITERATOR_DEBUGGING)
@@ -660,14 +682,24 @@ if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
     set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT texconv)
 endif()
 
+if(BUILD_TOOLS AND (NOT VCPKG_TOOLCHAIN))
+    foreach(t IN LISTS TOOL_EXES)
+      install(TARGETS ${t} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+    endforeach()
+endif()
+
 #--- Test suite
-include(CTest)
-if(BUILD_TESTING AND WIN32 AND (NOT WINDOWS_STORE) AND (NOT (DEFINED XBOX_CONSOLE_TARGET))
-   AND (EXISTS "${CMAKE_CURRENT_LIST_DIR}/Tests/CMakeLists.txt"))
+if(WIN32 AND (NOT WINDOWS_STORE) AND (NOT (DEFINED XBOX_CONSOLE_TARGET)))
+    include(CTest)
+    if(BUILD_TESTING AND (EXISTS "${CMAKE_CURRENT_LIST_DIR}/Tests/CMakeLists.txt"))
         enable_testing()
         add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Tests)
-elseif(BUILD_FUZZING AND WIN32 AND (NOT WINDOWS_STORE) AND (NOT (DEFINED XBOX_CONSOLE_TARGET))
-   AND (EXISTS "${CMAKE_CURRENT_LIST_DIR}/Tests/fuzzloaders/CMakeLists.txt"))
+
+        if(ENABLE_CODE_COVERAGE AND (DEFINED COV_COMPILER_SWITCHES))
+          target_compile_options(${PROJECT_NAME} PRIVATE ${COV_COMPILER_SWITCHES})
+        endif()
+    elseif(BUILD_FUZZING AND (EXISTS "${CMAKE_CURRENT_LIST_DIR}/Tests/fuzzloaders/CMakeLists.txt"))
         message(STATUS "Building for fuzzing")
         add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Tests/fuzzloaders)
+    endif()
 endif()

CMakePresets.json

@@ -38,6 +38,19 @@
       "cacheVariables": { "DIRECTX_ARCH": "arm64" },
       "hidden": true
     },
+    {
+      "name": "ARM64EC",
+      "architecture": {
+        "value": "arm64ec",
+        "strategy": "external"
+      },
+      "cacheVariables": { "DIRECTX_ARCH": "arm64ec" },
+      "environment": {
+        "CFLAGS": "/arm64EC",
+        "CXXFLAGS": "/arm64EC"
+      },
+      "hidden": true
+    },
 
     {
       "name": "Debug",
@@ -76,6 +89,22 @@
         "strategy": "external"
       }
     },
+    {
+      "name": "Clang-X86",
+      "environment": {
+        "CFLAGS": "-m32",
+        "CXXFLAGS": "-m32"
+      },
+      "hidden": true
+    },
+    {
+      "name": "Clang-AArch64",
+      "environment": {
+        "CFLAGS": "--target=arm64-pc-windows-msvc",
+        "CXXFLAGS": "--target=arm64-pc-windows-msvc"
+      },
+      "hidden": true
+    },
     {
       "name": "GNUC",
       "hidden": true,
@@ -89,7 +118,7 @@
     },
 
     {
-      "name": "Win7",
+      "name": "Win8",
       "cacheVariables": {
         "BUILD_DX12": false
       },
@@ -134,24 +163,21 @@
     {
       "name": "Scarlett",
       "cacheVariables": {
-        "XBOX_CONSOLE_TARGET": "scarlett",
-        "BUILD_TESTING": false
+        "XBOX_CONSOLE_TARGET": "scarlett"
       },
       "hidden": true
     },
     {
       "name": "XboxOne",
       "cacheVariables": {
-        "XBOX_CONSOLE_TARGET": "xboxone",
-        "BUILD_TESTING": false
+        "XBOX_CONSOLE_TARGET": "xboxone"
       },
       "hidden": true
     },
     {
       "name": "Durango",
       "cacheVariables": {
-        "XBOX_CONSOLE_TARGET": "durango",
-        "BUILD_TESTING": false
+        "XBOX_CONSOLE_TARGET": "durango"
       },
       "hidden": true
     },
@@ -172,6 +198,14 @@
       },
       "hidden": true
     },
+    {
+      "name": "JPEG_PNG",
+      "cacheVariables": {
+        "ENABLE_LIBJPEG_SUPPORT": true,
+        "ENABLE_LIBPNG_SUPPORT": true
+      },
+      "hidden": true
+    },
     {
       "name": "MinGW32",
       "hidden": true,
@@ -180,7 +214,7 @@
       },
       "cacheVariables": {
         "VCPKG_TARGET_TRIPLET": "x86-mingw-static",
-        "VCPKG_HOST_TRIPLET": "x86-mingw-static"
+        "VCPKG_HOST_TRIPLET": "x64-windows"
       }
     },
     {
@@ -191,9 +225,50 @@
       },
       "cacheVariables": {
         "VCPKG_TARGET_TRIPLET": "x64-mingw-static",
-        "VCPKG_HOST_TRIPLET": "x64-mingw-static"
+        "VCPKG_HOST_TRIPLET": "x64-windows"
       }
     },
+    {
+      "name": "Intel",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_CXX_COMPILER": "icl.exe",
+        "BUILD_TOOLS": false
+      },
+      "toolset": {
+        "value": "host=x64",
+        "strategy": "external"
+      }
+    },
+    {
+      "name": "IntelLLVM",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_CXX_COMPILER": "icx.exe"
+      },
+      "toolset": {
+        "value": "host=x64",
+        "strategy": "external"
+      }
+    },
+
+    {
+      "name": "Analyze",
+      "cacheVariables":
+      {
+        "ENABLE_CODE_ANALYSIS": true
+      },
+      "hidden": true
+    },
+    {
+      "name": "Coverage",
+      "cacheVariables":
+      {
+        "BUILD_TOOLS": false,
+        "ENABLE_CODE_COVERAGE": true
+      },
+      "hidden": true
+    },
     {
       "name": "Fuzzing",
       "cacheVariables": {
@@ -208,7 +283,9 @@
     { "name": "x86-Debug"      , "description": "MSVC for x86 (Debug) with DX12", "inherits": [ "base", "x86", "Debug", "MSVC" ] },
     { "name": "x86-Release"    , "description": "MSVC for x86 (Release) with DX12", "inherits": [ "base", "x86", "Release", "MSVC" ] },
     { "name": "arm64-Debug"    , "description": "MSVC for ARM64 (Debug) with DX12", "inherits": [ "base", "ARM64", "Debug", "MSVC" ] },
-    { "name": "arm64-Release", "description": "MSVC for ARM64 (Release) with DX12", "inherits": [ "base", "ARM64", "Release", "MSVC" ] },
+    { "name": "arm64-Release"  , "description": "MSVC for ARM64 (Release) with DX12", "inherits": [ "base", "ARM64", "Release", "MSVC" ] },
+    { "name": "arm64ec-Debug"  , "description": "MSVC for ARM64EC (Debug) with DX12", "inherits": [ "base", "ARM64EC", "Debug", "MSVC" ] },
+    { "name": "arm64ec-Release", "description": "MSVC for ARM64EC (Release) with DX12", "inherits": [ "base", "ARM64EC", "Release", "MSVC" ] },
 
     { "name": "x64-Debug-UWP"    , "description": "MSVC for x64 (Debug) for UWP", "inherits": [ "base", "x64", "Debug", "MSVC", "UWP" ] },
     { "name": "x64-Release-UWP"  , "description": "MSVC for x64 (Release) for UWP", "inherits": [ "base", "x64", "Release", "MSVC", "UWP" ] },
@@ -217,10 +294,10 @@
     { "name": "arm64-Debug-UWP"  , "description": "MSVC for ARM64 (Debug) for UWP", "inherits": [ "base", "ARM64", "Debug", "MSVC", "UWP" ] },
     { "name": "arm64-Release-UWP", "description": "MSVC for ARM64 (Release) for UWP", "inherits": [ "base", "ARM64", "Release", "MSVC", "UWP" ] },
 
-    { "name": "x64-Debug-Win7"    , "description": "MSVC for x64 (Debug) for Windows 7", "inherits": [ "base", "x64", "Debug", "MSVC", "Win7" ] },
-    { "name": "x64-Release-Win7"  , "description": "MSVC for x64 (Release) for Windows 7", "inherits": [ "base", "x64", "Release", "MSVC", "Win7" ] },
-    { "name": "x86-Debug-Win7"    , "description": "MSVC for x86 (Debug) for Windows 7", "inherits": [ "base", "x86", "Debug", "MSVC", "Win7" ] },
-    { "name": "x86-Release-Win7"  , "description": "MSVC for x86 (Release) for Windows 7", "inherits": [ "base", "x86", "Release", "MSVC", "Win7" ] },
+    { "name": "x64-Debug-Win8"    , "description": "MSVC for x64 (Debug) for Windows 8.1", "inherits": [ "base", "x64", "Debug", "MSVC", "Win8" ] },
+    { "name": "x64-Release-Win8"  , "description": "MSVC for x64 (Release) for Windows 8.1", "inherits": [ "base", "x64", "Release", "MSVC", "Win8" ] },
+    { "name": "x86-Debug-Win8"    , "description": "MSVC for x86 (Debug) for Windows 8.1", "inherits": [ "base", "x86", "Debug", "MSVC", "Win8" ] },
+    { "name": "x86-Release-Win8"  , "description": "MSVC for x86 (Release) for Windows 8.1", "inherits": [ "base", "x86", "Release", "MSVC", "Win8" ] },
 
     { "name": "x64-Debug-Scarlett"    , "description": "MSVC for x64 (Debug) for Xbox Series X|S", "inherits": [ "base", "x64", "Debug", "MSVC", "Scarlett" ] },
     { "name": "x64-Release-Scarlett"  , "description": "MSVC for x64 (Release) for Xbox Series X|S", "inherits": [ "base", "x64", "Release", "MSVC", "Scarlett" ] },
@@ -236,29 +313,44 @@
     { "name": "x86-Debug-VCPKG"      , "description": "MSVC for x86 (Debug) using VCPKG", "inherits": [ "base", "x86", "Debug", "MSVC", "VCPKG" ] },
     { "name": "x86-Release-VCPKG"    , "description": "MSVC for x86 (Release) using VCPKG", "inherits": [ "base", "x86", "Release", "MSVC", "VCPKG" ] },
     { "name": "arm64-Debug-VCPKG"    , "description": "MSVC for ARM64 (Debug) using VCPKG", "inherits": [ "base", "ARM64", "Debug", "MSVC", "VCPKG" ] },
-    { "name": "arm64-Release-VCPKG", "description": "MSVC for ARM64 (Release) using VCPKG", "inherits": [ "base", "ARM64", "Release", "MSVC", "VCPKG" ] },
+    { "name": "arm64-Release-VCPKG"  , "description": "MSVC for ARM64 (Release) using VCPKG", "inherits": [ "base", "ARM64", "Release", "MSVC", "VCPKG" ] },
+    { "name": "arm64ec-Debug-VCPKG"  , "description": "MSVC for ARM64EC (Debug) using VCPKG", "inherits": [ "base", "ARM64EC", "Debug", "MSVC", "VCPKG" ], "cacheVariables": { "VCPKG_TARGET_TRIPLET": "arm64ec-windows" } },
+    { "name": "arm64ec-Release-VCPKG", "description": "MSVC for ARM64EC (Release) using VCPKG", "inherits": [ "base", "ARM64EC", "Release", "MSVC", "VCPKG" ], "cacheVariables": { "VCPKG_TARGET_TRIPLET": "arm64ec-windows" } },
 
     { "name": "x64-Debug-EXR"      , "description": "MSVC for x64 (Debug) using VCPKG/OpenEXR", "inherits": [ "base", "x64", "Debug", "MSVC", "VCPKG", "EXR" ] },
     { "name": "x64-Release-EXR"    , "description": "MSVC for x64 (Release) using VCPKG/OpenEXR", "inherits": [ "base", "x64", "Release", "MSVC", "VCPKG", "EXR" ] },
 
+    { "name": "x64-Debug-JPEG-PNG"  , "description": "MSVC for x64 (Debug) using VCPKG/PNG/JPEG", "inherits": [ "base", "x64", "Debug", "MSVC", "VCPKG", "JPEG_PNG" ] },
+    { "name": "x64-Release-JPEG-PNG", "description": "MSVC for x64 (Release) using VCPKG/PNG/JPEG", "inherits": [ "base", "x64", "Release", "MSVC", "VCPKG", "JPEG_PNG" ] },
+
     { "name": "x64-Debug-Clang"    , "description": "Clang/LLVM for x64 (Debug) with DX12", "inherits": [ "base", "x64", "Debug", "Clang" ] },
     { "name": "x64-Release-Clang"  , "description": "Clang/LLVM for x64 (Release) with DX12", "inherits": [ "base", "x64", "Release", "Clang" ] },
-    { "name": "x86-Debug-Clang"    , "description": "Clang/LLVM for x86 (Debug) with DX12", "inherits": [ "base", "x86", "Debug", "Clang" ], "environment": { "CXXFLAGS": "-m32" } },
-    { "name": "x86-Release-Clang"  , "description": "Clang/LLVM for x86 (Release) with DX12", "inherits": [ "base", "x86", "Release", "Clang" ], "environment": { "CXXFLAGS": "-m32" } },
-    { "name": "arm64-Debug-Clang"  , "description": "Clang/LLVM for AArch64 (Debug) with DX12", "inherits": [ "base", "ARM64", "Debug", "Clang" ], "environment": { "CXXFLAGS": "--target=arm64-pc-windows-msvc" } },
-    { "name": "arm64-Release-Clang", "description": "Clang/LLVM for AArch64 (Release) with DX12", "inherits": [ "base", "ARM64", "Release", "Clang" ], "environment": { "CXXFLAGS": "--target=arm64-pc-windows-msvc" } },
+    { "name": "x86-Debug-Clang"    , "description": "Clang/LLVM for x86 (Debug) with DX12", "inherits": [ "base", "x86", "Debug", "Clang", "Clang-X86" ] },
+    { "name": "x86-Release-Clang"  , "description": "Clang/LLVM for x86 (Release) with DX12", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86" ] },
+    { "name": "arm64-Debug-Clang"  , "description": "Clang/LLVM for AArch64 (Debug) with DX12", "inherits": [ "base", "ARM64", "Debug", "Clang", "Clang-AArch64" ] },
+    { "name": "arm64-Release-Clang", "description": "Clang/LLVM for AArch64 (Release) with DX12", "inherits": [ "base", "ARM64", "Release", "Clang", "Clang-AArch64" ] },
 
     { "name": "x64-Debug-UWP-Clang"    , "description": "Clang/LLVM for x64 (Debug) for UWP", "inherits": [ "base", "x64", "Debug", "Clang", "UWP" ] },
     { "name": "x64-Release-UWP-Clang"  , "description": "Clang/LLVM for x64 (Release) for UWP", "inherits": [ "base", "x64", "Release", "Clang", "UWP" ] },
-    { "name": "x86-Debug-UWP-Clang"    , "description": "Clang/LLVM for x86 (Debug) for UWP", "inherits": [ "base", "x86", "Debug", "Clang", "UWP" ], "environment": { "CXXFLAGS": "-m32" } },
-    { "name": "x86-Release-UWP-Clang"  , "description": "Clang/LLVM for x86 (Release) for UWP", "inherits": [ "base", "x86", "Release", "Clang", "UWP" ], "environment": { "CXXFLAGS": "-m32" } },
-    { "name": "arm64-Debug-UWP-Clang"  , "description": "Clang/LLVM for AArch64 (Debug) for UWP", "inherits": [ "base", "ARM64", "Debug", "Clang", "UWP" ], "environment": { "CXXFLAGS": "--target=arm64-pc-windows-msvc" } },
-    { "name": "arm64-Release-UWP-Clang", "description": "Clang/LLVM for AArch64 (Release) for UWP", "inherits": [ "base", "ARM64", "Release", "Clang", "UWP" ], "environment": { "CXXFLAGS": "--target=arm64-pc-windows-msvc" } },
+    { "name": "x86-Debug-UWP-Clang"    , "description": "Clang/LLVM for x86 (Debug) for UWP", "inherits": [ "base", "x86", "Debug", "Clang", "Clang-X86", "UWP" ] },
+    { "name": "x86-Release-UWP-Clang"  , "description": "Clang/LLVM for x86 (Release) for UWP", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86", "UWP" ] },
+    { "name": "arm64-Debug-UWP-Clang"  , "description": "Clang/LLVM for AArch64 (Debug) for UWP", "inherits": [ "base", "ARM64", "Debug", "Clang", "Clang-AArch64", "UWP" ] },
+    { "name": "arm64-Release-UWP-Clang", "description": "Clang/LLVM for AArch64 (Release) for UWP", "inherits": [ "base", "ARM64", "Release", "Clang", "Clang-AArch64", "UWP" ] },
 
-    { "name": "x64-Debug-Win7-Clang"  , "description": "Clang/LLVM for x64 (Debug) for Windows 7", "inherits": [ "base", "x64", "Debug", "Clang", "Win7" ] },
-    { "name": "x64-Release-Win7-Clang", "description": "Clang/LLVM for x64 (Release) for Windows 7", "inherits": [ "base", "x64", "Release", "Clang", "Win7" ] },
-    { "name": "x86-Debug-Win7-Clang"  , "description": "Clang/LLVM for x86 (Debug) for Windows 7", "inherits": [ "base", "x86", "Debug", "Clang", "Win7" ], "environment": { "CXXFLAGS": "-m32" } },
-    { "name": "x86-Release-Win7-Clang", "description": "Clang/LLVM for x86 (Release) for Windows 7", "inherits": [ "base", "x86", "Release", "Clang", "Win7" ], "environment": { "CXXFLAGS": "-m32" } },
+    { "name": "x64-Debug-Win8-Clang"  , "description": "Clang/LLVM for x64 (Debug) for Windows 8.1", "inherits": [ "base", "x64", "Debug", "Clang", "Win8" ] },
+    { "name": "x64-Release-Win8-Clang", "description": "Clang/LLVM for x64 (Release) for Windows 8.1", "inherits": [ "base", "x64", "Release", "Clang", "Win8" ] },
+    { "name": "x86-Debug-Win8-Clang"  , "description": "Clang/LLVM for x86 (Debug) for Windows 8.1", "inherits": [ "base", "x86", "Debug", "Clang", "Clang-X86", "Win8" ] },
+    { "name": "x86-Release-Win8-Clang", "description": "Clang/LLVM for x86 (Release) for Windows 8.1", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86", "Win8" ] },
+
+    { "name": "x64-Debug-Clang-VCPKG"    , "description": "Clang/LLVM for x64 (Debug) using VCPKG/OpenEXR", "inherits": [ "base", "x64", "Debug", "Clang", "VCPKG" ] },
+    { "name": "x64-Release-Clang-VCPKG"  , "description": "Clang/LLVM for x64 (Release) using VCPKG/OpenEXR", "inherits": [ "base", "x64", "Release", "Clang", "VCPKG" ] },
+    { "name": "x86-Debug-Clang-VCPKG"    , "description": "Clang/LLVM for x86 (Debug) using VCPKG/OpenEXR", "inherits": [ "base", "x86", "Debug", "Clang", "Clang-X86", "VCPKG" ] },
+    { "name": "x86-Release-Clang-VCPKG"  , "description": "Clang/LLVM for x86 (Release) using VCPKG/OpenEXR", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86", "VCPKG" ] },
+    { "name": "arm64-Debug-Clang-VCPKG"  , "description": "Clang/LLVM for AArch64 (Debug) using VCPKG/OpenEXR", "inherits": [ "base", "ARM64", "Debug", "Clang", "Clang-AArch64", "VCPKG" ] },
+    { "name": "arm64-Release-Clang-VCPKG", "description": "Clang/LLVM for AArch64 (Release) using VCPKG/OpenEXR", "inherits": [ "base", "ARM64", "Release", "Clang", "Clang-AArch64", "VCPKG" ] },
+
+    { "name": "x64-Debug-Clang-JPEG-PNG"   , "description": "Clang/LLVM for x64 (Debug) with DX12", "inherits": [ "base", "x64", "Debug", "Clang", "VCPKG", "JPEG_PNG" ] },
+    { "name": "x64-Release-Clang-JPEG-PNG" , "description": "Clang/LLVM for x64 (Release) with DX12", "inherits": [ "base", "x64", "Release", "Clang", "VCPKG", "JPEG_PNG" ] },
 
     { "name": "x64-Debug-GDKX"     , "description": "MSVC for x64 (Debug) Xbox One Extensions", "inherits": [ "base", "x64", "Debug", "GDKX", "MSVC" ] },
     { "name": "x64-Release-GDKX"   , "description": "MSVC for x64 (Release) Xbox One Extensions", "inherits": [ "base", "x64", "Release", "GDKX", "MSVC" ] },
@@ -272,16 +364,36 @@
     { "name": "x64-Debug-GDKX-S-Clang"   , "description": "MSVC for x64 (Debug) Xbox Series X|S Extensions", "inherits": [ "base", "x64", "Debug", "GDKXS", "Clang" ] },
     { "name": "x64-Release-GDKX-S-Clang" , "description": "MSVC for x64 (Release) Xbox Series X|S Extensions", "inherits": [ "base", "x64", "Release", "GDKXS", "Clang" ] },
 
+    { "name": "x64-Debug-Scarlett-Clang"  , "description": "Clang/LLVM for x64 (Debug) for Xbox Series X|S", "inherits": [ "base", "x64", "Debug", "Clang", "Scarlett" ] },
+    { "name": "x64-Release-Scarlett-Clang", "description": "Clang/LLVM for x64 (Release) for Xbox Series X|S", "inherits": [ "base", "x64", "Release", "Clang", "Scarlett" ] },
+
+    { "name": "x64-Debug-XboxOne-Clang"   , "description": "Clang/LLVM for x64 (Debug) for Xbox One", "inherits": [ "base", "x64", "Debug", "Clang", "XboxOne" ] },
+    { "name": "x64-Release-XboxOne-Clang" , "description": "Clang/LLVM for x64 (Release) for Xbox One", "inherits": [ "base", "x64", "Release", "Clang", "XboxOne" ] },
+
     { "name": "x64-Debug-MinGW"  , "description": "MinG-W64 (Debug)", "inherits": [ "base", "x64", "Debug", "GNUC", "VCPKG", "MinGW64" ] },
     { "name": "x64-Release-MinGW", "description": "MinG-W64 (Release)", "inherits": [ "base", "x64", "Release", "GNUC", "VCPKG", "MinGW64" ] },
     { "name": "x86-Debug-MinGW"  , "description": "MinG-W32 (Debug)", "inherits": [ "base", "x86", "Debug", "GNUC", "VCPKG", "MinGW32" ] },
     { "name": "x86-Release-MinGW", "description": "MinG-W32 (Release)", "inherits": [ "base", "x86", "Release", "GNUC", "VCPKG", "MinGW32" ] },
 
-    { "name": "x64-Debug-Linux",     "description": "WSL Linux x64 (Debug)", "inherits": [ "base", "x64", "Debug", "VCPKG" ] },
-    { "name": "x64-Release-Linux",   "description": "WSL Linux x64 (Release)", "inherits": [ "base", "x64", "Release", "VCPKG" ] },
-    { "name": "arm64-Debug-Linux",   "description": "WSL Linux ARM64 (Debug)", "inherits": [ "base", "ARM64", "Debug", "VCPKG" ] },
-    { "name": "arm64-Release-Linux", "description": "WSL Linux ARM64 (Release)", "inherits": [ "base", "ARM64", "Release", "VCPKG" ] },
+    { "name": "x64-Debug-MinGW-JPEG-PNG"  , "description": "MinG-W64 (Debug)", "inherits": [ "base", "x64", "Debug", "GNUC", "VCPKG", "MinGW64", "JPEG_PNG" ] },
+    { "name": "x64-Release-MinGW-JPEG-PNG", "description": "MinG-W64 (Release)", "inherits": [ "base", "x64", "Release", "GNUC", "VCPKG", "MinGW64", "JPEG_PNG" ] },
+    { "name": "x86-Debug-MinGW-JPEG-PNG"  , "description": "MinG-W32 (Debug)", "inherits": [ "base", "x86", "Debug", "GNUC", "VCPKG", "MinGW32", "JPEG_PNG" ] },
+    { "name": "x86-Release-MinGW-JPEG-PNG", "description": "MinG-W32 (Release)", "inherits": [ "base", "x86", "Release", "GNUC", "VCPKG", "MinGW32", "JPEG_PNG" ] },
 
+    { "name": "x64-Debug-Linux",     "description": "WSL Linux x64 (Debug)", "inherits": [ "base", "x64", "Debug", "VCPKG", "JPEG_PNG" ] },
+    { "name": "x64-Release-Linux",   "description": "WSL Linux x64 (Release)", "inherits": [ "base", "x64", "Release", "VCPKG", "JPEG_PNG" ] },
+    { "name": "arm64-Debug-Linux",   "description": "WSL Linux ARM64 (Debug)", "inherits": [ "base", "ARM64", "Debug", "VCPKG", "JPEG_PNG" ] },
+    { "name": "arm64-Release-Linux", "description": "WSL Linux ARM64 (Release)", "inherits": [ "base", "ARM64", "Release", "VCPKG", "JPEG_PNG" ] },
+
+    { "name": "x64-Debug-ICC"     , "description": "Intel Classic Compiler (Debug) with DX12", "inherits": [ "base", "x64", "Debug", "Intel" ] },
+    { "name": "x64-Release-ICC"   , "description": "Intel Classic Compiler (Release) with DX12", "inherits": [ "base", "x64", "Release", "Intel" ] },
+
+    { "name": "x64-Debug-ICX"    , "description": "Intel oneAPI Compiler (Debug) with DX12", "inherits": [ "base", "x64", "Debug", "IntelLLVM" ] },
+    { "name": "x64-Release-ICX"  , "description": "Intel oneAPI Compiler (Release) with DX12", "inherits": [ "base", "x64", "Release", "IntelLLVM" ] },
+
+    { "name": "x64-Analyze"       , "description": "MSVC for x64 (Debug) with DX12 using /analyze", "inherits": [ "base", "x64", "Debug", "MSVC", "Analyze" ] },
+    { "name": "x64-Coverage"      , "description": "MSVC for x64 (Debug) with DX12 w/ Code Coverage", "inherits": [ "base", "x64", "Debug", "MSVC", "Coverage" ] },
+    { "name": "x64-Coverage-Clang", "description": "Clang/LLVM for x64 (Debug) with DX12 w/ Code Coverage", "inherits": [ "base", "x64", "Debug", "Clang", "Coverage" ] },
     { "name": "x64-Fuzzing"       , "description": "MSVC for x64 (Release) with ASan", "inherits": [ "base", "x64", "Release", "MSVC", "Fuzzing" ] }
   ],
   "testPresets": [
@@ -290,7 +402,18 @@
     { "name": "x86-Debug"      , "configurePreset": "x86-Debug" },
     { "name": "x86-Release"    , "configurePreset": "x86-Release" },
     { "name": "arm64-Debug"    , "configurePreset": "arm64-Debug" },
-    { "name": "arm64-Release", "configurePreset": "arm64-Release" },
+    { "name": "arm64-Release"  , "configurePreset": "arm64-Release" },
+    { "name": "arm64ec-Debug"  , "configurePreset": "arm64ec-Debug" },
+    { "name": "arm64ec-Release", "configurePreset": "arm64ec-Release" },
+
+    { "name": "x64-Debug-VCPKG"      , "configurePreset": "x64-Debug-VCPKG" },
+    { "name": "x64-Release-VCPKG"    , "configurePreset": "x64-Release-VCPKG" },
+    { "name": "x86-Debug-VCPKG"      , "configurePreset": "x86-Debug-VCPKG" },
+    { "name": "x86-Release-VCPKG"    , "configurePreset": "x86-Release-VCPKG" },
+    { "name": "arm64-Debug-VCPKG"    , "configurePreset": "arm64-Debug-VCPKG" },
+    { "name": "arm64-Release-VCPKG"  , "configurePreset": "arm64-Release-VCPKG" },
+    { "name": "arm64ec-Debug-VCPKG"  , "configurePreset": "arm64ec-Debug-VCPKG" },
+    { "name": "arm64ec-Release-VCPKG", "configurePreset": "arm64ec-Release-VCPKG" },
 
     { "name": "x64-Debug-Clang"    , "configurePreset": "x64-Debug-Clang" },
     { "name": "x64-Release-Clang"  , "configurePreset": "x64-Release-Clang" },
@@ -299,9 +422,23 @@
     { "name": "arm64-Debug-Clang"  , "configurePreset": "arm64-Debug-Clang" },
     { "name": "arm64-Release-Clang", "configurePreset": "arm64-Release-Clang" },
 
+    { "name": "x64-Debug-GDKX"     , "configurePreset": "x64-Debug-GDKX" },
+    { "name": "x64-Release-GDKX"   , "configurePreset": "x64-Release-GDKX" },
+    { "name": "x64-Debug-GDKX-S"   , "configurePreset": "x64-Debug-GDKX-S" },
+    { "name": "x64-Release-GDKX-S" , "configurePreset": "x64-Release-GDKX-S" },
+
     { "name": "x64-Debug-MinGW"    , "configurePreset": "x64-Debug-MinGW" },
     { "name": "x64-Release-MinGW"  , "configurePreset": "x64-Release-MinGW" },
     { "name": "x86-Debug-MinGW"    , "configurePreset": "x86-Debug-MinGW" },
-    { "name": "x86-Release-MinGW"  , "configurePreset": "x86-Release-MinGW" }
+    { "name": "x86-Release-MinGW"  , "configurePreset": "x86-Release-MinGW" },
+
+    { "name": "x64-Debug-ICC"    , "configurePreset": "x64-Debug-ICC" },
+    { "name": "x64-Release-ICC"  , "configurePreset": "x64-Release-ICC"},
+
+    { "name": "x64-Debug-ICX"    , "configurePreset": "x64-Debug-ICX" },
+    { "name": "x64-Release-ICX"  , "configurePreset": "x64-Release-ICX"},
+
+    { "name": "x64-Debug-JPEG-PNG"  , "configurePreset": "x64-Debug-JPEG-PNG" },
+    { "name": "x64-Release-JPEG-PNG", "configurePreset": "x64-Release-JPEG-PNG"}
   ]
 }

CODE_OF_CONDUCT.md

@@ -0,0 +1,10 @@
+# Microsoft Open Source Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+
+Resources:
+
+- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
+- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
+- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns
+- Employees can reach out at [aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support)

Common/CmdLineHelpers.h

@@ -0,0 +1,375 @@
+//--------------------------------------------------------------------------------------
+// File: CmdLineHelpers.h
+//
+// Command-line tool shared functions
+//
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//--------------------------------------------------------------------------------------
+
+#pragma once
+
+#if __cplusplus < 201703L
+#error Requires C++17 (and /Zc:__cplusplus with MSVC)
+#endif
+
+#include <algorithm>
+#include <cstdio>
+#include <cwchar>
+#include <filesystem>
+#include <fstream>
+#include <list>
+#include <memory>
+#include <set>
+#include <string>
+
+#ifndef TOOL_VERSION
+#error Define TOOL_VERSION before including this header
+#endif
+
+
+namespace Helpers
+{
+    struct handle_closer { void operator()(HANDLE h) { if (h) CloseHandle(h); } };
+
+    using ScopedHandle = std::unique_ptr<void, handle_closer>;
+
+    inline HANDLE safe_handle(HANDLE h) noexcept { return (h == INVALID_HANDLE_VALUE) ? nullptr : h; }
+
+    struct find_closer { void operator()(HANDLE h) noexcept { assert(h != INVALID_HANDLE_VALUE); if (h) FindClose(h); } };
+
+    using ScopedFindHandle = std::unique_ptr<void, find_closer>;
+
+#ifdef _PREFAST_
+#pragma prefast(disable : 26018, "Only used with static internal arrays")
+#endif
+
+    struct SConversion
+    {
+        std::wstring szSrc;
+        std::wstring szFolder;
+    };
+
+    template<typename T>
+    struct SValue
+    {
+        const wchar_t*  name;
+        T               value;
+    };
+
+    template<typename T>
+    T LookupByName(const wchar_t _In_z_ *pName, const SValue<T> *pArray)
+    {
+        while (pArray->name)
+        {
+            if (!_wcsicmp(pName, pArray->name))
+                return pArray->value;
+
+            pArray++;
+        }
+
+        return static_cast<T>(0);
+    }
+
+    template<typename T>
+    const wchar_t* LookupByValue(T value, const SValue<T> *pArray)
+    {
+        while (pArray->name)
+        {
+            if (value == pArray->value)
+                return pArray->name;
+
+            pArray++;
+        }
+
+        return L"";
+    }
+
+    void PrintFormat(DXGI_FORMAT Format, const SValue<DXGI_FORMAT>* pFormatList)
+    {
+        for (auto pFormat = pFormatList; pFormat->name; pFormat++)
+        {
+            if (pFormat->value == Format)
+            {
+                wprintf(L"%ls", pFormat->name);
+                return;
+            }
+        }
+
+        wprintf(L"*UNKNOWN*");
+    }
+
+    void PrintFormat(DXGI_FORMAT Format, const SValue<DXGI_FORMAT>* pFormatList1, const SValue<DXGI_FORMAT>* pFormatList2)
+    {
+        for (auto pFormat = pFormatList1; pFormat->name; pFormat++)
+        {
+            if (pFormat->value == Format)
+            {
+                wprintf(L"%ls", pFormat->name);
+                return;
+            }
+        }
+
+        for (auto pFormat = pFormatList2; pFormat->name; pFormat++)
+        {
+            if (pFormat->value == Format)
+            {
+                wprintf(L"%ls", pFormat->name);
+                return;
+            }
+        }
+
+        wprintf(L"*UNKNOWN*");
+    }
+
+    template<typename T>
+    void PrintList(size_t cch, const SValue<T> *pValue)
+    {
+        while (pValue->name)
+        {
+            const size_t cchName = wcslen(pValue->name);
+
+            if (cch + cchName + 2 >= 80)
+            {
+                wprintf(L"\n      ");
+                cch = 6;
+            }
+
+            wprintf(L"%ls ", pValue->name);
+            cch += cchName + 2;
+            pValue++;
+        }
+
+        wprintf(L"\n");
+    }
+
+    void PrintLogo(bool versionOnly, _In_z_ const wchar_t* name, _In_z_ const wchar_t* desc)
+    {
+        wchar_t version[32] = {};
+
+        wchar_t appName[_MAX_PATH] = {};
+        if (GetModuleFileNameW(nullptr, appName, _MAX_PATH))
+        {
+            const DWORD size = GetFileVersionInfoSizeW(appName, nullptr);
+            if (size > 0)
+            {
+                auto verInfo = std::make_unique<uint8_t[]>(size);
+                if (GetFileVersionInfoW(appName, 0, size, verInfo.get()))
+                {
+                    LPVOID lpstr = nullptr;
+                    UINT strLen = 0;
+                    if (VerQueryValueW(verInfo.get(), L"\\StringFileInfo\\040904B0\\ProductVersion", &lpstr, &strLen))
+                    {
+                        wcsncpy_s(version, reinterpret_cast<const wchar_t*>(lpstr), strLen);
+                    }
+                }
+            }
+        }
+
+        if (!*version || wcscmp(version, L"1.0.0.0") == 0)
+        {
+            swprintf_s(version, L"%03d (library)", TOOL_VERSION);
+        }
+
+        if (versionOnly)
+        {
+            wprintf(L"%ls version %ls\n", name, version);
+        }
+        else
+        {
+            wprintf(L"%ls Version %ls\n", desc, version);
+            wprintf(L"Copyright (C) Microsoft Corp.\n");
+        #ifdef _DEBUG
+            wprintf(L"*** Debug build ***\n");
+        #endif
+            wprintf(L"\n");
+        }
+    }
+
+    void SearchForFiles(const std::filesystem::path& path, std::list<SConversion>& files, bool recursive, _In_opt_z_ const wchar_t* folder)
+    {
+        // Process files
+        WIN32_FIND_DATAW findData = {};
+        ScopedFindHandle hFile(safe_handle(FindFirstFileExW(path.c_str(),
+            FindExInfoBasic, &findData,
+            FindExSearchNameMatch, nullptr,
+            FIND_FIRST_EX_LARGE_FETCH)));
+        if (hFile)
+        {
+            for (;;)
+            {
+                if (!(findData.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY)))
+                {
+                    SConversion conv = {};
+                    conv.szSrc = path.parent_path().append(findData.cFileName).native();
+                    if (folder)
+                    {
+                        conv.szFolder = folder;
+                    }
+                    files.push_back(conv);
+                }
+
+                if (!FindNextFileW(hFile.get(), &findData))
+                    break;
+            }
+        }
+
+        // Process directories
+        if (recursive)
+        {
+            auto searchDir = path.parent_path().append(L"*");
+
+            hFile.reset(safe_handle(FindFirstFileExW(searchDir.c_str(),
+                FindExInfoBasic, &findData,
+                FindExSearchLimitToDirectories, nullptr,
+                FIND_FIRST_EX_LARGE_FETCH)));
+            if (!hFile)
+                return;
+
+            for (;;)
+            {
+                if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+                {
+                    if (findData.cFileName[0] != L'.')
+                    {
+                        auto subfolder = (folder)
+                            ? (std::wstring(folder) + std::wstring(findData.cFileName) + std::filesystem::path::preferred_separator)
+                            : (std::wstring(findData.cFileName) + std::filesystem::path::preferred_separator);
+
+                        auto subdir = path.parent_path().append(findData.cFileName).append(path.filename().c_str());
+
+                        SearchForFiles(subdir, files, recursive, subfolder.c_str());
+                    }
+                }
+
+                if (!FindNextFileW(hFile.get(), &findData))
+                    break;
+            }
+        }
+    }
+
+    void ProcessFileList(std::wifstream& inFile, std::list<SConversion>& files)
+    {
+        std::list<SConversion> flist;
+        std::set<std::wstring> excludes;
+
+        for (;;)
+        {
+            std::wstring fname;
+            std::getline(inFile, fname);
+            if (!inFile)
+                break;
+
+            if (fname[0] == L'#')
+            {
+                // Comment
+            }
+            else if (fname[0] == L'-')
+            {
+                if (flist.empty())
+                {
+                    wprintf(L"WARNING: Ignoring the line '%ls' in -flist\n", fname.c_str());
+                }
+                else
+                {
+                    std::filesystem::path path(fname.c_str() + 1);
+                    auto& npath = path.make_preferred();
+                    if (wcspbrk(fname.c_str(), L"?*") != nullptr)
+                    {
+                        std::list<SConversion> removeFiles;
+                        SearchForFiles(npath, removeFiles, false, nullptr);
+
+                        for (auto& it : removeFiles)
+                        {
+                            std::wstring name = it.szSrc;
+                            std::transform(name.begin(), name.end(), name.begin(), towlower);
+                            excludes.insert(name);
+                        }
+                    }
+                    else
+                    {
+                        std::wstring name = npath.c_str();
+                        std::transform(name.begin(), name.end(), name.begin(), towlower);
+                        excludes.insert(name);
+                    }
+                }
+            }
+            else if (wcspbrk(fname.c_str(), L"?*") != nullptr)
+            {
+                std::filesystem::path path(fname.c_str());
+                SearchForFiles(path.make_preferred(), flist, false, nullptr);
+            }
+            else
+            {
+                SConversion conv = {};
+                std::filesystem::path path(fname.c_str());
+                conv.szSrc = path.make_preferred().native();
+                flist.push_back(conv);
+            }
+        }
+
+        inFile.close();
+
+        if (!excludes.empty())
+        {
+            // Remove any excluded files
+            for (auto it = flist.begin(); it != flist.end();)
+            {
+                std::wstring name = it->szSrc;
+                std::transform(name.begin(), name.end(), name.begin(), towlower);
+                auto item = it;
+                ++it;
+                if (excludes.find(name) != excludes.end())
+                {
+                    flist.erase(item);
+                }
+            }
+        }
+
+        if (flist.empty())
+        {
+            wprintf(L"WARNING: No file names found in -flist\n");
+        }
+        else
+        {
+            files.splice(files.end(), flist);
+        }
+    }
+
+    const wchar_t* GetErrorDesc(HRESULT hr)
+    {
+        static wchar_t desc[1024] = {};
+
+        LPWSTR errorText = nullptr;
+
+        const DWORD result = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+            nullptr, static_cast<DWORD>(hr),
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), reinterpret_cast<LPWSTR>(&errorText), 0, nullptr);
+
+        *desc = 0;
+
+        if (result > 0 && errorText)
+        {
+            swprintf_s(desc, L": %ls", errorText);
+
+            size_t len = wcslen(desc);
+            if (len >= 1)
+            {
+                desc[len - 1] = 0;
+            }
+
+            if (errorText)
+                LocalFree(errorText);
+
+            for (wchar_t* ptr = desc; *ptr != 0; ++ptr)
+            {
+                if (*ptr == L'\r' || *ptr == L'\n')
+                {
+                    *ptr = L' ';
+                }
+            }
+        }
+
+        return desc;
+    }
+}

DDSTextureLoader/DDSTextureLoader11.cpp

@@ -18,6 +18,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <memory>
 #include <new>
 
@@ -53,12 +54,14 @@ using namespace DirectX;
 //
 // See DDS.h in the 'Texconv' sample and the 'DirectXTex' library
 //--------------------------------------------------------------------------------------
+namespace
+{
 #pragma pack(push,1)
 
-constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
+    constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
 
-struct DDS_PIXELFORMAT
-{
+    struct DDS_PIXELFORMAT
+    {
         uint32_t    size;
         uint32_t    flags;
         uint32_t    fourCC;
@@ -67,7 +70,7 @@ struct DDS_PIXELFORMAT
         uint32_t    GBitMask;
         uint32_t    BBitMask;
         uint32_t    ABitMask;
-};
+    };
 
 #define DDS_FOURCC      0x00000004  // DDPF_FOURCC
 #define DDS_RGB         0x00000040  // DDPF_RGB
@@ -92,13 +95,13 @@ struct DDS_PIXELFORMAT
 
 #define DDS_CUBEMAP 0x00000200 // DDSCAPS2_CUBEMAP
 
-enum DDS_MISC_FLAGS2
-{
+    enum DDS_MISC_FLAGS2
+    {
         DDS_MISC_FLAGS2_ALPHA_MODE_MASK = 0x7L,
-};
+    };
 
-struct DDS_HEADER
-{
+    struct DDS_HEADER
+    {
         uint32_t        size;
         uint32_t        flags;
         uint32_t        height;
@@ -113,42 +116,47 @@ struct DDS_HEADER
         uint32_t        caps3;
         uint32_t        caps4;
         uint32_t        reserved2;
-};
+    };
 
-struct DDS_HEADER_DXT10
-{
+    struct DDS_HEADER_DXT10
+    {
         DXGI_FORMAT     dxgiFormat;
         uint32_t        resourceDimension;
         uint32_t        miscFlag; // see D3D11_RESOURCE_MISC_FLAG
         uint32_t        arraySize;
         uint32_t        miscFlags2;
-};
+    };
 
 #pragma pack(pop)
 
-//--------------------------------------------------------------------------------------
-namespace
-{
+    static_assert(sizeof(DDS_PIXELFORMAT) == 32, "DDS pixel format size mismatch");
+    static_assert(sizeof(DDS_HEADER) == 124, "DDS Header size mismatch");
+    static_assert(sizeof(DDS_HEADER_DXT10) == 20, "DDS DX10 Extended Header size mismatch");
+
+    constexpr size_t DDS_MIN_HEADER_SIZE = sizeof(uint32_t) + sizeof(DDS_HEADER);
+    constexpr size_t DDS_DX10_HEADER_SIZE = sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10);
+    static_assert(DDS_DX10_HEADER_SIZE > DDS_MIN_HEADER_SIZE, "DDS DX10 Header should be larger than standard header");
+
+    //--------------------------------------------------------------------------------------
     struct handle_closer { void operator()(HANDLE h) noexcept { if (h) CloseHandle(h); } };
 
     using ScopedHandle = std::unique_ptr<void, handle_closer>;
 
     inline HANDLE safe_handle(HANDLE h) noexcept { return (h == INVALID_HANDLE_VALUE) ? nullptr : h; }
 
-    #if defined(_DEBUG) || defined(PROFILE)
+#if defined(_DEBUG) || defined(PROFILE)
     template<UINT TNameLength>
     inline void SetDebugObjectName(_In_ ID3D11DeviceChild* resource, _In_ const char(&name)[TNameLength]) noexcept
     {
         resource->SetPrivateData(WKPDID_D3DDebugObjectName, TNameLength - 1, name);
     }
-    #else
+#else
     template<UINT TNameLength>
     inline void SetDebugObjectName(_In_ ID3D11DeviceChild*, _In_ const char(&)[TNameLength]) noexcept
-    {
-    }
-    #endif
+    {}
+#endif
 
-    //--------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------
     HRESULT LoadTextureDataFromMemory(
         _In_reads_(ddsDataSize) const uint8_t* ddsData,
         size_t ddsDataSize,
@@ -168,13 +176,13 @@ namespace
             return E_FAIL;
         }
 
-        if (ddsDataSize < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
+        if (ddsDataSize < DDS_MIN_HEADER_SIZE)
         {
             return E_FAIL;
         }
 
         // DDS files always start with the same magic number ("DDS ")
-        auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData);
+        const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData);
         if (dwMagicNumber != DDS_MAGIC)
         {
             return E_FAIL;
@@ -195,7 +203,7 @@ namespace
             (MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
         {
             // Must be long enough for both headers and magic value
-            if (ddsDataSize < (sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10)))
+            if (ddsDataSize < DDS_DX10_HEADER_SIZE)
             {
                 return E_FAIL;
             }
@@ -205,8 +213,7 @@ namespace
 
         // setup the pointers in the process request
         *header = hdr;
-        auto offset = sizeof(uint32_t)
-            + sizeof(DDS_HEADER)
+        auto offset = DDS_MIN_HEADER_SIZE
             + (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0u);
         *bitData = ddsData + offset;
         *bitSize = ddsDataSize - offset;
@@ -231,20 +238,10 @@ namespace
         *bitSize = 0;
 
         // open the file
-    #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
         ScopedHandle hFile(safe_handle(CreateFile2(
             fileName,
             GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
             nullptr)));
-    #else
-        ScopedHandle hFile(safe_handle(CreateFileW(
-            fileName,
-            GENERIC_READ, FILE_SHARE_READ,
-            nullptr,
-            OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
-            nullptr)));
-    #endif
-
         if (!hFile)
         {
             return HRESULT_FROM_WIN32(GetLastError());
@@ -264,7 +261,7 @@ namespace
         }
 
         // Need at least enough data to fill the header and magic number to be a valid DDS
-        if (fileInfo.EndOfFile.LowPart < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
+        if (fileInfo.EndOfFile.LowPart < DDS_MIN_HEADER_SIZE)
         {
             return E_FAIL;
         }
@@ -296,7 +293,7 @@ namespace
         }
 
         // DDS files always start with the same magic number ("DDS ")
-        auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
+        const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
         if (dwMagicNumber != DDS_MAGIC)
         {
             ddsData.reset();
@@ -319,7 +316,7 @@ namespace
             (MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
         {
             // Must be long enough for both headers and magic value
-            if (fileInfo.EndOfFile.LowPart < (sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10)))
+            if (fileInfo.EndOfFile.LowPart < DDS_DX10_HEADER_SIZE)
             {
                 ddsData.reset();
                 return E_FAIL;
@@ -330,7 +327,7 @@ namespace
 
         // setup the pointers in the process request
         *header = hdr;
-        auto offset = sizeof(uint32_t) + sizeof(DDS_HEADER)
+        auto offset = DDS_MIN_HEADER_SIZE
             + (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0u);
         *bitData = ddsData.get() + offset;
         *bitSize = fileInfo.EndOfFile.LowPart - offset;
@@ -494,7 +491,7 @@ namespace
         _In_ size_t width,
         _In_ size_t height,
         _In_ DXGI_FORMAT fmt,
-        size_t* outNumBytes,
+        _Out_opt_ size_t* outNumBytes,
         _Out_opt_ size_t* outRowBytes,
         _Out_opt_ size_t* outNumRows) noexcept
     {
@@ -508,6 +505,9 @@ namespace
         size_t bpe = 0;
         switch (fmt)
         {
+        case DXGI_FORMAT_UNKNOWN:
+            return E_INVALIDARG;
+
         case DXGI_FORMAT_BC1_TYPELESS:
         case DXGI_FORMAT_BC1_UNORM:
         case DXGI_FORMAT_BC1_UNORM_SRGB:
@@ -561,6 +561,15 @@ namespace
             bpe = 2;
             break;
 
+        #if (_WIN32_WINNT >= _WIN32_WINNT_WIN10)
+
+        case DXGI_FORMAT_P208:
+            planar = true;
+            bpe = 2;
+            break;
+
+        #endif
+
         case DXGI_FORMAT_P010:
         case DXGI_FORMAT_P016:
             if ((height % 2) != 0)
@@ -746,6 +755,9 @@ namespace
 
                 // No 3:3:2 or paletted DXGI formats aka D3DFMT_R3G3B2, D3DFMT_P8
                 break;
+
+            default:
+                return DXGI_FORMAT_UNKNOWN;
             }
         }
         else if (ddpf.flags & DDS_LUMINANCE)
@@ -776,6 +788,9 @@ namespace
                     return DXGI_FORMAT_R8G8_UNORM; // Some DDS writers assume the bitcount should be 8 instead of 16
                 }
                 break;
+
+            default:
+                return DXGI_FORMAT_UNKNOWN;
             }
         }
         else if (ddpf.flags & DDS_ALPHA)
@@ -808,6 +823,9 @@ namespace
                     return DXGI_FORMAT_R8G8_SNORM; // D3DX10/11 writes this out as DX10 extension
                 }
                 break;
+
+            default:
+                return DXGI_FORMAT_UNKNOWN;
             }
 
             // No DXGI format maps to DDPF_BUMPLUMINANCE aka D3DFMT_L6V5U5, D3DFMT_X8L8V8U8
@@ -908,6 +926,9 @@ namespace
                 return DXGI_FORMAT_R32G32B32A32_FLOAT;
 
             // No DXGI format maps to D3DFMT_CxV8U8
+
+            default:
+                return DXGI_FORMAT_UNKNOWN;
             }
         }
 
@@ -1312,6 +1333,9 @@ namespace
                 }
             }
             break;
+
+        default:
+            return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
         }
 
         return hr;
@@ -1726,7 +1750,7 @@ namespace
             if (MAKEFOURCC('D', 'X', '1', '0') == header->ddspf.fourCC)
             {
                 auto d3d10ext = reinterpret_cast<const DDS_HEADER_DXT10*>(reinterpret_cast<const uint8_t*>(header) + sizeof(DDS_HEADER));
-                auto const mode = static_cast<DDS_ALPHA_MODE>(d3d10ext->miscFlags2 & DDS_MISC_FLAGS2_ALPHA_MODE_MASK);
+                const auto mode = static_cast<DDS_ALPHA_MODE>(d3d10ext->miscFlags2 & DDS_MISC_FLAGS2_ALPHA_MODE_MASK);
                 switch (mode)
                 {
                 case DDS_ALPHA_MODE_STRAIGHT:
@@ -1771,29 +1795,19 @@ namespace
             );
             if (result > 0)
             {
-                const char* pstrName = strrchr(strFileA, '\\');
-                if (!pstrName)
-                {
-                    pstrName = strFileA;
-                }
-                else
-                {
-                    pstrName++;
-                }
-
                 if (texture && *texture)
                 {
                     (*texture)->SetPrivateData(WKPDID_D3DDebugObjectName,
-                        static_cast<UINT>(strnlen_s(pstrName, MAX_PATH)),
-                        pstrName
+                        static_cast<UINT>(result),
+                        strFileA
                     );
                 }
 
                 if (textureView && *textureView)
                 {
                     (*textureView)->SetPrivateData(WKPDID_D3DDebugObjectName,
-                        static_cast<UINT>(strnlen_s(pstrName, MAX_PATH)),
-                        pstrName
+                        static_cast<UINT>(result),
+                        strFileA
                     );
                 }
             }

DDSTextureLoader/DDSTextureLoader11.h

@@ -51,6 +51,7 @@ namespace DirectX
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
+#pragma clang diagnostic ignored "-Wextra-semi-stmt"
 #endif
 
     DEFINE_ENUM_FLAG_OPERATORS(DDS_LOADER_FLAGS);

DDSTextureLoader/DDSTextureLoader12.cpp

@@ -18,6 +18,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <memory>
 #include <new>
 
@@ -81,12 +82,14 @@ using namespace DirectX;
 //
 // See DDS.h in the 'Texconv' sample and the 'DirectXTex' library
 //--------------------------------------------------------------------------------------
+namespace
+{
 #pragma pack(push,1)
 
-constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
+    constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
 
-struct DDS_PIXELFORMAT
-{
+    struct DDS_PIXELFORMAT
+    {
         uint32_t    size;
         uint32_t    flags;
         uint32_t    fourCC;
@@ -95,7 +98,7 @@ struct DDS_PIXELFORMAT
         uint32_t    GBitMask;
         uint32_t    BBitMask;
         uint32_t    ABitMask;
-};
+    };
 
 #define DDS_FOURCC      0x00000004  // DDPF_FOURCC
 #define DDS_RGB         0x00000040  // DDPF_RGB
@@ -120,13 +123,13 @@ struct DDS_PIXELFORMAT
 
 #define DDS_CUBEMAP 0x00000200 // DDSCAPS2_CUBEMAP
 
-enum DDS_MISC_FLAGS2
-{
+    enum DDS_MISC_FLAGS2
+    {
         DDS_MISC_FLAGS2_ALPHA_MODE_MASK = 0x7L,
-};
+    };
 
-struct DDS_HEADER
-{
+    struct DDS_HEADER
+    {
         uint32_t        size;
         uint32_t        flags;
         uint32_t        height;
@@ -141,22 +144,28 @@ struct DDS_HEADER
         uint32_t        caps3;
         uint32_t        caps4;
         uint32_t        reserved2;
-};
+    };
 
-struct DDS_HEADER_DXT10
-{
+    struct DDS_HEADER_DXT10
+    {
         DXGI_FORMAT     dxgiFormat;
         uint32_t        resourceDimension;
         uint32_t        miscFlag; // see D3D11_RESOURCE_MISC_FLAG
         uint32_t        arraySize;
         uint32_t        miscFlags2;
-};
+    };
 
 #pragma pack(pop)
 
-//--------------------------------------------------------------------------------------
-namespace
-{
+    static_assert(sizeof(DDS_PIXELFORMAT) == 32, "DDS pixel format size mismatch");
+    static_assert(sizeof(DDS_HEADER) == 124, "DDS Header size mismatch");
+    static_assert(sizeof(DDS_HEADER_DXT10) == 20, "DDS DX10 Extended Header size mismatch");
+
+    constexpr size_t DDS_MIN_HEADER_SIZE = sizeof(uint32_t) + sizeof(DDS_HEADER);
+    constexpr size_t DDS_DX10_HEADER_SIZE = sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10);
+    static_assert(DDS_DX10_HEADER_SIZE > DDS_MIN_HEADER_SIZE, "DDS DX10 Header should be larger than standard header");
+
+    //--------------------------------------------------------------------------------------
 #ifdef _WIN32
     struct handle_closer { void operator()(HANDLE h) noexcept { if (h) CloseHandle(h); } };
 
@@ -165,18 +174,17 @@ namespace
     inline HANDLE safe_handle(HANDLE h) noexcept { return (h == INVALID_HANDLE_VALUE) ? nullptr : h; }
 #endif
 
-    #if !defined(NO_D3D12_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
+#if !defined(NO_D3D12_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
     template<UINT TNameLength>
     inline void SetDebugObjectName(_In_ ID3D12DeviceChild* resource, _In_z_ const wchar_t(&name)[TNameLength]) noexcept
     {
         resource->SetName(name);
     }
-    #else
+#else
     template<UINT TNameLength>
     inline void SetDebugObjectName(_In_ ID3D12DeviceChild*, _In_z_ const wchar_t(&)[TNameLength]) noexcept
-    {
-    }
-    #endif
+    {}
+#endif
 
     inline uint32_t CountMips(uint32_t width, uint32_t height) noexcept
     {
@@ -214,13 +222,13 @@ namespace
             return E_FAIL;
         }
 
-        if (ddsDataSize < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
+        if (ddsDataSize < DDS_MIN_HEADER_SIZE)
         {
             return E_FAIL;
         }
 
         // DDS files always start with the same magic number ("DDS ")
-        auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData);
+        const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData);
         if (dwMagicNumber != DDS_MAGIC)
         {
             return E_FAIL;
@@ -241,7 +249,7 @@ namespace
             (MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
         {
             // Must be long enough for both headers and magic value
-            if (ddsDataSize < (sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10)))
+            if (ddsDataSize < DDS_DX10_HEADER_SIZE)
             {
                 return E_FAIL;
             }
@@ -251,8 +259,7 @@ namespace
 
         // setup the pointers in the process request
         *header = hdr;
-        auto offset = sizeof(uint32_t)
-            + sizeof(DDS_HEADER)
+        auto offset = DDS_MIN_HEADER_SIZE
             + (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0u);
         *bitData = ddsData + offset;
         *bitSize = ddsDataSize - offset;
@@ -302,7 +309,7 @@ namespace
         }
 
         // Need at least enough data to fill the header and magic number to be a valid DDS
-        if (fileInfo.EndOfFile.LowPart < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
+        if (fileInfo.EndOfFile.LowPart < DDS_MIN_HEADER_SIZE)
         {
             return E_FAIL;
         }
@@ -345,7 +352,7 @@ namespace
             return E_FAIL;
 
         // Need at least enough data to fill the header and magic number to be a valid DDS
-        if (fileLen < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
+        if (fileLen < DDS_MIN_HEADER_SIZE)
             return E_FAIL;
 
         ddsData.reset(new (std::nothrow) uint8_t[size_t(fileLen)]);
@@ -372,7 +379,7 @@ namespace
     #endif
 
         // DDS files always start with the same magic number ("DDS ")
-        auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
+        const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
         if (dwMagicNumber != DDS_MAGIC)
         {
             ddsData.reset();
@@ -395,7 +402,7 @@ namespace
             (MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
         {
             // Must be long enough for both headers and magic value
-            if (len < (sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10)))
+            if (len < DDS_DX10_HEADER_SIZE)
             {
                 ddsData.reset();
                 return E_FAIL;
@@ -406,7 +413,7 @@ namespace
 
         // setup the pointers in the process request
         *header = hdr;
-        auto offset = sizeof(uint32_t) + sizeof(DDS_HEADER)
+        auto offset = DDS_MIN_HEADER_SIZE
             + (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0u);
         *bitData = ddsData.get() + offset;
         *bitSize = len - offset;
@@ -573,7 +580,7 @@ namespace
         _In_ size_t width,
         _In_ size_t height,
         _In_ DXGI_FORMAT fmt,
-        size_t* outNumBytes,
+        _Out_opt_ size_t* outNumBytes,
         _Out_opt_ size_t* outRowBytes,
         _Out_opt_ size_t* outNumRows) noexcept
     {
@@ -587,6 +594,9 @@ namespace
         size_t bpe = 0;
         switch (fmt)
         {
+        case DXGI_FORMAT_UNKNOWN:
+            return E_INVALIDARG;
+
         case DXGI_FORMAT_BC1_TYPELESS:
         case DXGI_FORMAT_BC1_UNORM:
         case DXGI_FORMAT_BC1_UNORM_SRGB:
@@ -830,6 +840,9 @@ namespace
 
                 // No 3:3:2 or paletted DXGI formats aka D3DFMT_R3G3B2, D3DFMT_P8
                 break;
+
+            default:
+                return DXGI_FORMAT_UNKNOWN;
             }
         }
         else if (ddpf.flags & DDS_LUMINANCE)
@@ -860,6 +873,9 @@ namespace
                     return DXGI_FORMAT_R8G8_UNORM; // Some DDS writers assume the bitcount should be 8 instead of 16
                 }
                 break;
+
+            default:
+                return DXGI_FORMAT_UNKNOWN;
             }
         }
         else if (ddpf.flags & DDS_ALPHA)
@@ -892,6 +908,9 @@ namespace
                     return DXGI_FORMAT_R8G8_SNORM; // D3DX10/11 writes this out as DX10 extension
                 }
                 break;
+
+            default:
+                return DXGI_FORMAT_UNKNOWN;
             }
 
             // No DXGI format maps to DDPF_BUMPLUMINANCE aka D3DFMT_L6V5U5, D3DFMT_X8L8V8U8
@@ -992,6 +1011,9 @@ namespace
                 return DXGI_FORMAT_R32G32B32A32_FLOAT;
 
             // No DXGI format maps to D3DFMT_CxV8U8
+
+            default:
+                return DXGI_FORMAT_UNKNOWN;
             }
         }
 
@@ -1127,6 +1149,9 @@ namespace
                 res.SlicePitch = res.RowPitch * static_cast<LONG>(height);
             }
             break;
+
+        default:
+            break;
         }
     }
 
@@ -1597,7 +1622,7 @@ namespace
             if (MAKEFOURCC('D', 'X', '1', '0') == header->ddspf.fourCC)
             {
                 auto d3d10ext = reinterpret_cast<const DDS_HEADER_DXT10*>(reinterpret_cast<const uint8_t*>(header) + sizeof(DDS_HEADER));
-                auto const mode = static_cast<DDS_ALPHA_MODE>(d3d10ext->miscFlags2 & DDS_MISC_FLAGS2_ALPHA_MODE_MASK);
+                const auto mode = static_cast<DDS_ALPHA_MODE>(d3d10ext->miscFlags2 & DDS_MISC_FLAGS2_ALPHA_MODE_MASK);
                 switch (mode)
                 {
                 case DDS_ALPHA_MODE_STRAIGHT:

DDSTextureLoader/DDSTextureLoader12.h

@@ -68,6 +68,7 @@ namespace DirectX
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
+#pragma clang diagnostic ignored "-Wextra-semi-stmt"
 #endif
 
     DEFINE_ENUM_FLAG_OPERATORS(DDS_LOADER_FLAGS);

DDSTextureLoader/DDSTextureLoader9.cpp

@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <cstring>
 #include <memory>
 #include <new>
@@ -57,12 +58,14 @@ using Microsoft::WRL::ComPtr;
 //
 // See DDS.h in the 'Texconv' sample and the 'DirectXTex' library
 //--------------------------------------------------------------------------------------
+namespace
+{
 #pragma pack(push,1)
 
-constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
+    constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
 
-struct DDS_PIXELFORMAT
-{
+    struct DDS_PIXELFORMAT
+    {
         uint32_t    size;
         uint32_t    flags;
         uint32_t    fourCC;
@@ -71,7 +74,7 @@ struct DDS_PIXELFORMAT
         uint32_t    GBitMask;
         uint32_t    BBitMask;
         uint32_t    ABitMask;
-};
+    };
 
 #define DDS_FOURCC          0x00000004  // DDPF_FOURCC
 #define DDS_RGB             0x00000040  // DDPF_RGB
@@ -95,8 +98,8 @@ struct DDS_PIXELFORMAT
 
 #define DDS_CUBEMAP 0x00000200 // DDSCAPS2_CUBEMAP
 
-struct DDS_HEADER
-{
+    struct DDS_HEADER
+    {
         uint32_t        size;
         uint32_t        flags;
         uint32_t        height;
@@ -111,13 +114,16 @@ struct DDS_HEADER
         uint32_t        caps3;
         uint32_t        caps4;
         uint32_t        reserved2;
-};
+    };
 
 #pragma pack(pop)
 
-//--------------------------------------------------------------------------------------
-namespace
-{
+    static_assert(sizeof(DDS_PIXELFORMAT) == 32, "DDS pixel format size mismatch");
+    static_assert(sizeof(DDS_HEADER) == 124, "DDS Header size mismatch");
+
+    constexpr size_t DDS_DX9_HEADER_SIZE = sizeof(uint32_t) + sizeof(DDS_HEADER);
+
+    //--------------------------------------------------------------------------------------
     struct handle_closer { void operator()(HANDLE h) noexcept { if (h) CloseHandle(h); } };
 
     using ScopedHandle = std::unique_ptr<void, handle_closer>;
@@ -144,13 +150,13 @@ namespace
             return E_FAIL;
         }
 
-        if (ddsDataSize < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
+        if (ddsDataSize < DDS_DX9_HEADER_SIZE)
         {
             return E_FAIL;
         }
 
         // DDS files always start with the same magic number ("DDS ")
-        auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData);
+        const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData);
         if (dwMagicNumber != DDS_MAGIC)
         {
             return E_FAIL;
@@ -175,9 +181,8 @@ namespace
 
         // setup the pointers in the process request
         *header = hdr;
-        auto offset = sizeof(uint32_t) + sizeof(DDS_HEADER);
-        *bitData = ddsData + offset;
-        *bitSize = ddsDataSize - offset;
+        *bitData = ddsData + DDS_DX9_HEADER_SIZE;
+        *bitSize = ddsDataSize - DDS_DX9_HEADER_SIZE;
 
         return S_OK;
     }
@@ -199,22 +204,10 @@ namespace
         *bitSize = 0;
 
         // open the file
-    #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-        ScopedHandle hFile(safe_handle(CreateFile2(fileName,
-            GENERIC_READ,
-            FILE_SHARE_READ,
-            OPEN_EXISTING,
+        ScopedHandle hFile(safe_handle(CreateFile2(
+            fileName,
+            GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
             nullptr)));
-    #else
-        ScopedHandle hFile(safe_handle(CreateFileW(fileName,
-            GENERIC_READ,
-            FILE_SHARE_READ,
-            nullptr,
-            OPEN_EXISTING,
-            FILE_ATTRIBUTE_NORMAL,
-            nullptr)));
-    #endif
-
         if (!hFile)
         {
             return HRESULT_FROM_WIN32(GetLastError());
@@ -234,7 +227,7 @@ namespace
         }
 
         // Need at least enough data to fill the header and magic number to be a valid DDS
-        if (fileInfo.EndOfFile.LowPart < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
+        if (fileInfo.EndOfFile.LowPart < DDS_DX9_HEADER_SIZE)
         {
             return E_FAIL;
         }
@@ -266,7 +259,7 @@ namespace
         }
 
         // DDS files always start with the same magic number ("DDS ")
-        auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
+        const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
         if (dwMagicNumber != DDS_MAGIC)
         {
             ddsData.reset();
@@ -294,9 +287,8 @@ namespace
 
         // setup the pointers in the process request
         *header = hdr;
-        auto offset = sizeof(uint32_t) + sizeof(DDS_HEADER);
-        *bitData = ddsData.get() + offset;
-        *bitSize = fileInfo.EndOfFile.LowPart - offset;
+        *bitData = ddsData.get() + DDS_DX9_HEADER_SIZE;
+        *bitSize = fileInfo.EndOfFile.LowPart - DDS_DX9_HEADER_SIZE;
 
         return S_OK;
     }
@@ -412,7 +404,7 @@ namespace
         _In_ size_t width,
         _In_ size_t height,
         _In_ D3DFORMAT fmt,
-        size_t* outNumBytes,
+        _Out_opt_ size_t* outNumBytes,
         _Out_opt_ size_t* outRowBytes,
         _Out_opt_ size_t* outNumRows) noexcept
     {
@@ -425,6 +417,9 @@ namespace
         size_t bpe = 0;
         switch (static_cast<int>(fmt))
         {
+        case D3DFMT_UNKNOWN:
+            return E_INVALIDARG;
+
         case D3DFMT_DXT1:
             bc = true;
             bpe = 8;
@@ -620,6 +615,9 @@ namespace
 
                 // Paletted texture formats are typically not supported on modern video cards aka D3DFMT_P8, D3DFMT_A8P8
                 break;
+
+            default:
+                return D3DFMT_UNKNOWN;
             }
         }
         else if (ddpf.flags & DDS_LUMINANCE)
@@ -651,6 +649,9 @@ namespace
                     return D3DFMT_A8L8; // Some DDS writers assume the bitcount should be 8 instead of 16
                 }
                 break;
+
+            default:
+                return D3DFMT_UNKNOWN;
             }
         }
         else if (ddpf.flags & DDS_ALPHA)
@@ -685,6 +686,9 @@ namespace
                     return D3DFMT_V8U8;
                 }
                 break;
+
+            default:
+                return D3DFMT_UNKNOWN;
             }
         }
         else if (ddpf.flags & DDS_BUMPLUMINANCE)
@@ -704,6 +708,9 @@ namespace
                     return D3DFMT_L6V5U5;
                 }
                 break;
+
+            default:
+                return D3DFMT_UNKNOWN;
             }
         }
         else if (ddpf.flags & DDS_FOURCC)
@@ -760,6 +767,9 @@ namespace
             case D3DFMT_A32B32G32R32F:
             case D3DFMT_CxV8U8:
                 return static_cast<D3DFORMAT>(ddpf.fourCC);
+
+            default:
+                return D3DFMT_UNKNOWN;
             }
         }
 

DDSView/DDSView.rc

@@ -28,7 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_MAIN_ICON           ICON                    "directx.ico"
+IDI_MAIN_ICON           ICON                    "..\\Common\\directx.ico"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////

DDSView/DDSView_Desktop_2019.vcxproj

@@ -135,7 +135,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>true</SDLCheck>
       <AdditionalOptions>/Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
@@ -146,6 +146,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <LargeAddressAware>true</LargeAddressAware>
+      <AdditionalOptions>/CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Manifest>
       <EnableDPIAwareness>false</EnableDPIAwareness>
@@ -158,7 +159,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FloatingPointModel>Fast</FloatingPointModel>
       <AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>true</SDLCheck>
       <AdditionalOptions>/Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
@@ -168,6 +169,7 @@
       <AdditionalDependencies>d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalOptions>/CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Manifest>
       <EnableDPIAwareness>false</EnableDPIAwareness>
@@ -180,7 +182,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>true</SDLCheck>
@@ -194,6 +196,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <LargeAddressAware>true</LargeAddressAware>
+      <AdditionalOptions>/CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Manifest>
       <EnableDPIAwareness>false</EnableDPIAwareness>
@@ -205,7 +208,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FloatingPointModel>Fast</FloatingPointModel>
       <AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>true</SDLCheck>
@@ -218,6 +221,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalOptions>/CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Manifest>
       <EnableDPIAwareness>false</EnableDPIAwareness>
@@ -230,7 +234,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>true</SDLCheck>
@@ -244,6 +248,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <LargeAddressAware>true</LargeAddressAware>
+      <AdditionalOptions>/CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Manifest>
       <EnableDPIAwareness>false</EnableDPIAwareness>
@@ -255,7 +260,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FloatingPointModel>Fast</FloatingPointModel>
       <AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>true</SDLCheck>
@@ -268,6 +273,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalOptions>/CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Manifest>
       <EnableDPIAwareness>false</EnableDPIAwareness>
@@ -285,7 +291,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="ddsview.fx" />
+    <None Include="ddsview.hlsl" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
@@ -294,10 +300,13 @@
       <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
       <_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
       <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\</_ATGFXCPath>
+      <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`))</_ATGFXCVer>
+      <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\</_ATGFXCVer>
     </PropertyGroup>
-    <Exec Condition="!Exists('Shaders/ddsview_vs.inc')" WorkingDirectory="$(ProjectDir)" Command="hlsl" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath)" />
+    <Exec Condition="!Exists('Shaders/ddsview_vs.inc')" WorkingDirectory="$(ProjectDir)" Command="hlsl" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath);WindowsSDKVersion=$(_ATGFXCVer);CompileShadersOutput=$(ProjectDir)\Shaders" LogStandardErrorAsError="true" />
     <PropertyGroup>
       <_ATGFXCPath />
+      <_ATGFXCVer />
     </PropertyGroup>
   </Target>
   <Target Name="ATGDeleteShaders" AfterTargets="Clean">

DDSView/DDSView_Desktop_2019.vcxproj.filters

@@ -15,6 +15,6 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="ddsview.fx" />
+    <None Include="ddsview.hlsl" />
   </ItemGroup>
 </Project>

DDSView/DDSView_Desktop_2022.vcxproj

@@ -135,7 +135,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>true</SDLCheck>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
@@ -159,7 +159,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FloatingPointModel>Fast</FloatingPointModel>
       <AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>true</SDLCheck>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
@@ -182,7 +182,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>true</SDLCheck>
@@ -208,7 +208,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FloatingPointModel>Fast</FloatingPointModel>
       <AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>true</SDLCheck>
@@ -234,7 +234,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>true</SDLCheck>
@@ -260,7 +260,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FloatingPointModel>Fast</FloatingPointModel>
       <AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>true</SDLCheck>
@@ -291,7 +291,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="ddsview.fx" />
+    <None Include="ddsview.hlsl" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
@@ -300,10 +300,13 @@
       <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
       <_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
       <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\</_ATGFXCPath>
+      <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`))</_ATGFXCVer>
+      <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\</_ATGFXCVer>
     </PropertyGroup>
-    <Exec Condition="!Exists('Shaders/ddsview_vs.inc')" WorkingDirectory="$(ProjectDir)" Command="hlsl" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath)" />
+    <Exec Condition="!Exists('Shaders/ddsview_vs.inc')" WorkingDirectory="$(ProjectDir)" Command="hlsl" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath);WindowsSDKVersion=$(_ATGFXCVer);CompileShadersOutput=$(ProjectDir)\Shaders" LogStandardErrorAsError="true" />
     <PropertyGroup>
       <_ATGFXCPath />
+      <_ATGFXCVer />
     </PropertyGroup>
   </Target>
   <Target Name="ATGDeleteShaders" AfterTargets="Clean">

DDSView/DDSView_Desktop_2022.vcxproj.filters

@@ -15,6 +15,6 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="ddsview.fx" />
+    <None Include="ddsview.hlsl" />
   </ItemGroup>
 </Project>

DDSView/ddsview.cpp

@@ -25,7 +25,9 @@
 
 #include <DirectXMath.h>
 
+#ifdef _MSC_VER
 #pragma warning(disable : 4619 4616 26812)
+#endif
 
 #include "DirectXTex.h"
 
@@ -103,7 +105,9 @@ LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 void Render();
 
 //--------------------------------------------------------------------------------------
+#ifdef _MSC_VER
 #pragma warning( suppress : 6262 )
+#endif
 int WINAPI wWinMain(
     _In_ HINSTANCE hInstance,
     _In_opt_ HINSTANCE /*hPrevInstance*/,

DDSView/hlsl.cmd

@@ -5,16 +5,25 @@ rem Licensed under the MIT License.
 setlocal
 set error=0
 
+if %PROCESSOR_ARCHITECTURE%.==ARM64. (set FXCARCH=arm64) else (if %PROCESSOR_ARCHITECTURE%.==AMD64. (set FXCARCH=x64) else (set FXCARCH=x86))
+
 set FXCOPTS=/nologo /WX /Ges /Qstrip_reflect /Qstrip_debug
 
-set PCFXC="%WindowsSdkVerBinPath%x86\fxc.exe"
+if defined LegacyShaderCompiler goto fxcviaenv
+set PCFXC="%WindowsSdkVerBinPath%%FXCARCH%\fxc.exe"
 if exist %PCFXC% goto continue
-set PCFXC="%WindowsSdkBinPath%%WindowsSDKVersion%\x86\fxc.exe"
+set PCFXC="%WindowsSdkBinPath%%WindowsSDKVersion%\%FXCARCH%\fxc.exe"
 if exist %PCFXC% goto continue
-set PCFXC="%WindowsSdkDir%bin\%WindowsSDKVersion%\x86\fxc.exe"
+set PCFXC="%WindowsSdkDir%bin\%WindowsSDKVersion%\%FXCARCH%\fxc.exe"
 if exist %PCFXC% goto continue
 
 set PCFXC=fxc.exe
+goto continue
+
+:fxcviaenv
+set PCFXC="%LegacyShaderCompiler%"
+if not exist %PCFXC% goto needfxc
+goto continue
 
 :continue
 if not defined CompileShadersOutput set CompileShadersOutput=Shaders
@@ -23,45 +32,50 @@ set StrTrim=%StrTrim: ##=%
 set CompileShadersOutput=%StrTrim:##=%
 @if not exist "%CompileShadersOutput%" mkdir "%CompileShadersOutput%"
 
-
-set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EVS /Tvs_4_1 /Fh%CompileShadersOutput%\ddsview_vs.inc
+set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EVS /Tvs_4_1 /Fh%CompileShadersOutput%\ddsview_vs.inc
 echo %FXC%
 %FXC%
 @if ERRORLEVEL 1 goto error
 
-set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EPS_1D /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps1D.inc
+set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EPS_1D /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps1D.inc
 echo %FXC%
 %FXC%
 @if ERRORLEVEL 1 goto error
 
-set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EPS_1DArray /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps1Darray.inc
+set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EPS_1DArray /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps1Darray.inc
 echo %FXC%
 %FXC%
 @if ERRORLEVEL 1 goto error
 
-set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EPS_2D /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps2D.inc
+set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EPS_2D /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps2D.inc
 echo %FXC%
 %FXC%
 @if ERRORLEVEL 1 goto error
 
-set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EPS_2DArray /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps2Darray.inc
+set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EPS_2DArray /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps2Darray.inc
 echo %FXC%
 %FXC%
 @if ERRORLEVEL 1 goto error
 
-set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EPS_3D /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps3D.inc
+set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EPS_3D /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps3D.inc
 echo %FXC%
 %FXC%
 @if ERRORLEVEL 1 goto error
 
-set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EPS_Cube /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_psCube.inc
+set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EPS_Cube /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_psCube.inc
 echo %FXC%
 %FXC%
 @if ERRORLEVEL 1 goto error
 
 @echo --- Shaders built ok ---
-@goto end
+endlocal
+exit /b 0
+
 :error
 @echo --- ERROR: Shader build failed ---
 exit /b 1
+
+:needfxc
+echo ERROR: CompileShaders requires FXC.EXE
+exit /b 1
 :end

DirectXTex/BC.cpp

@@ -203,7 +203,7 @@ namespace
         }
 
         // Use Newton's Method to find local minima of sum-of-squares error.
-        auto const fSteps = static_cast<float>(cSteps - 1);
+        const auto fSteps = static_cast<float>(cSteps - 1);
 
         for (size_t iIteration = 0; iIteration < 8; iIteration++)
         {
@@ -1032,8 +1032,8 @@ void DirectX::D3DXEncodeBC3(uint8_t *pBC, const XMVECTOR *pColor, uint32_t flags
     float fAlphaA, fAlphaB;
     OptimizeAlpha<false>(&fAlphaA, &fAlphaB, fAlpha, uSteps);
 
-    auto const bAlphaA = static_cast<uint8_t>(static_cast<int32_t>(fAlphaA * 255.0f + 0.5f));
-    auto const bAlphaB = static_cast<uint8_t>(static_cast<int32_t>(fAlphaB * 255.0f + 0.5f));
+    const auto bAlphaA = static_cast<uint8_t>(static_cast<int32_t>(fAlphaA * 255.0f + 0.5f));
+    const auto bAlphaB = static_cast<uint8_t>(static_cast<int32_t>(fAlphaB * 255.0f + 0.5f));
 
     fAlphaA = static_cast<float>(bAlphaA) * (1.0f / 255.0f);
     fAlphaB = static_cast<float>(bAlphaB) * (1.0f / 255.0f);
@@ -1084,7 +1084,7 @@ void DirectX::D3DXEncodeBC3(uint8_t *pBC, const XMVECTOR *pColor, uint32_t flags
     }
 
     // Encode alpha bitmap
-    auto const fSteps = static_cast<float>(uSteps - 1);
+    const auto fSteps = static_cast<float>(uSteps - 1);
     const float fScale = (fStep[0] != fStep[1]) ? (fSteps / (fStep[1] - fStep[0])) : 0.0f;
 
     if (flags & BC_FLAGS_DITHER_A)

DirectXTex/BC.h

@@ -230,7 +230,7 @@ namespace DirectX
         }
 
         // Use Newton's Method to find local minima of sum-of-squares error.
-        auto const fSteps = static_cast<float>(cSteps - 1);
+        const auto fSteps = static_cast<float>(cSteps - 1);
 
         for (size_t iIteration = 0; iIteration < 8; iIteration++)
         {

DirectXTex/BC6HBC7.cpp

@@ -593,7 +593,7 @@ namespace
             assert(uStartBit < 128);
             _Analysis_assume_(uStartBit < 128);
             const size_t uIndex = uStartBit >> 3;
-            auto const ret = static_cast<uint8_t>((m_uBits[uIndex] >> (uStartBit - (uIndex << 3))) & 0x01);
+            const auto ret = static_cast<uint8_t>((m_uBits[uIndex] >> (uStartBit - (uIndex << 3))) & 0x01);
             uStartBit++;
             return ret;
         }
@@ -1290,7 +1290,7 @@ namespace
         }
 
         // Use Newton's Method to find local minima of sum-of-squares error.
-        auto const fSteps = static_cast<float>(cSteps - 1);
+        const auto fSteps = static_cast<float>(cSteps - 1);
 
         for (size_t iIteration = 0; iIteration < 8; iIteration++)
         {
@@ -1800,6 +1800,7 @@ void D3DX_BC6H::Decode(bool bSigned, HDRColorA* pOut) const noexcept
         case 0x17:  warnstr = "BC6H: Reserved mode 10111 encountered during decoding\n"; break;
         case 0x1B:  warnstr = "BC6H: Reserved mode 11011 encountered during decoding\n"; break;
         case 0x1F:  warnstr = "BC6H: Reserved mode 11111 encountered during decoding\n"; break;
+        default: break;
         }
         OutputDebugStringA(warnstr);
     #endif
@@ -2047,7 +2048,7 @@ float D3DX_BC6H::MapColorsQuantized(const EncodeParams* pEP, const INTColor aCol
     _Analysis_assume_(pEP->uMode < c_NumModes);
 
     const uint8_t uIndexPrec = ms_aInfo[pEP->uMode].uIndexPrec;
-    auto const uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
+    const auto uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
     INTColor aPalette[BC6H_MAX_INDICES];
     GeneratePaletteQuantized(pEP, endPts, aPalette);
 
@@ -2263,7 +2264,7 @@ void D3DX_BC6H::AssignIndices(const EncodeParams* pEP, const INTEndPntPair aEndP
     _Analysis_assume_(pEP->uMode < c_NumModes);
 
     const uint8_t uPartitions = ms_aInfo[pEP->uMode].uPartitions;
-    auto const uNumIndices = static_cast<const uint8_t>(1u << ms_aInfo[pEP->uMode].uIndexPrec);
+    const auto uNumIndices = static_cast<const uint8_t>(1u << ms_aInfo[pEP->uMode].uIndexPrec);
 
     assert(uPartitions < BC6H_MAX_REGIONS && pEP->uShape < BC6H_MAX_SHAPES);
     _Analysis_assume_(uPartitions < BC6H_MAX_REGIONS && pEP->uShape < BC6H_MAX_SHAPES);
@@ -2436,7 +2437,7 @@ void D3DX_BC6H::GeneratePaletteUnquantized(const EncodeParams* pEP, size_t uRegi
 
     const INTEndPntPair& endPts = pEP->aUnqEndPts[pEP->uShape][uRegion];
     const uint8_t uIndexPrec = ms_aInfo[pEP->uMode].uIndexPrec;
-    auto const uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
+    const auto uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
     assert(uNumIndices > 0);
     _Analysis_assume_(uNumIndices > 0);
 
@@ -2472,7 +2473,7 @@ float D3DX_BC6H::MapColors(const EncodeParams* pEP, size_t uRegion, size_t np, c
     _Analysis_assume_(pEP->uMode < c_NumModes);
 
     const uint8_t uIndexPrec = ms_aInfo[pEP->uMode].uIndexPrec;
-    auto const uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
+    const auto uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
     INTColor aPalette[BC6H_MAX_INDICES];
     GeneratePaletteUnquantized(pEP, uRegion, aPalette);
 
@@ -2576,7 +2577,7 @@ void D3DX_BC7::Decode(HDRColorA* pOut) const noexcept
         assert(uPartitions < BC7_MAX_REGIONS);
         _Analysis_assume_(uPartitions < BC7_MAX_REGIONS);
 
-        auto const uNumEndPts = static_cast<const uint8_t>((unsigned(uPartitions) + 1u) << 1);
+        const auto uNumEndPts = static_cast<const uint8_t>((unsigned(uPartitions) + 1u) << 1);
         const uint8_t uIndexPrec = ms_aInfo[uMode].uIndexPrec;
         const uint8_t uIndexPrec2 = ms_aInfo[uMode].uIndexPrec2;
         size_t i;
@@ -2692,7 +2693,14 @@ void D3DX_BC7::Decode(HDRColorA* pOut) const noexcept
 
         for (i = 0; i < uNumEndPts; i++)
         {
+        #ifdef __GNUC__
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wstringop-overflow"
+        #endif
             c[i] = Unquantize(c[i], RGBAPrecWithP);
+        #ifdef __GNUC_
+        #pragma GCC diagnostic pop
+        #endif
         }
 
         uint8_t w1[NUM_PIXELS_PER_BLOCK], w2[NUM_PIXELS_PER_BLOCK];
@@ -2755,6 +2763,7 @@ void D3DX_BC7::Decode(HDRColorA* pOut) const noexcept
             case 1: std::swap(outPixel.r, outPixel.a); break;
             case 2: std::swap(outPixel.g, outPixel.a); break;
             case 3: std::swap(outPixel.b, outPixel.a); break;
+            default: break;
             }
 
             pOut[i] = HDRColorA(outPixel);
@@ -2830,6 +2839,7 @@ void D3DX_BC7::Encode(uint32_t flags, const HDRColorA* const pIn) noexcept
             case 1: for (size_t i = 0; i < NUM_PIXELS_PER_BLOCK; i++) std::swap(EP.aLDRPixels[i].r, EP.aLDRPixels[i].a); break;
             case 2: for (size_t i = 0; i < NUM_PIXELS_PER_BLOCK; i++) std::swap(EP.aLDRPixels[i].g, EP.aLDRPixels[i].a); break;
             case 3: for (size_t i = 0; i < NUM_PIXELS_PER_BLOCK; i++) std::swap(EP.aLDRPixels[i].b, EP.aLDRPixels[i].a); break;
+            default: break;
             }
 
             for (size_t im = 0; im < uNumIdxMode && fMSEBest > 0; ++im)
@@ -2870,6 +2880,7 @@ void D3DX_BC7::Encode(uint32_t flags, const HDRColorA* const pIn) noexcept
             case 1: for (size_t i = 0; i < NUM_PIXELS_PER_BLOCK; i++) std::swap(EP.aLDRPixels[i].r, EP.aLDRPixels[i].a); break;
             case 2: for (size_t i = 0; i < NUM_PIXELS_PER_BLOCK; i++) std::swap(EP.aLDRPixels[i].g, EP.aLDRPixels[i].a); break;
             case 3: for (size_t i = 0; i < NUM_PIXELS_PER_BLOCK; i++) std::swap(EP.aLDRPixels[i].b, EP.aLDRPixels[i].a); break;
+            default: break;
             }
         }
     }
@@ -3140,8 +3151,8 @@ void D3DX_BC7::AssignIndices(const EncodeParams* pEP, size_t uShape, size_t uInd
 
     const uint8_t uIndexPrec = uIndexMode ? ms_aInfo[pEP->uMode].uIndexPrec2 : ms_aInfo[pEP->uMode].uIndexPrec;
     const uint8_t uIndexPrec2 = uIndexMode ? ms_aInfo[pEP->uMode].uIndexPrec : ms_aInfo[pEP->uMode].uIndexPrec2;
-    auto const uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
-    auto const uNumIndices2 = static_cast<const uint8_t>(1u << uIndexPrec2);
+    const auto uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
+    const auto uNumIndices2 = static_cast<const uint8_t>(1u << uIndexPrec2);
 
     assert((uNumIndices <= BC7_MAX_INDICES) && (uNumIndices2 <= BC7_MAX_INDICES));
     _Analysis_assume_((uNumIndices <= BC7_MAX_INDICES) && (uNumIndices2 <= BC7_MAX_INDICES));
@@ -3410,8 +3421,15 @@ float D3DX_BC7::Refine(const EncodeParams* pEP, size_t uShape, size_t uRotation,
 
     for (size_t p = 0; p <= uPartitions; p++)
     {
+    #ifdef __GNUC__
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wstringop-overflow"
+    #endif
         aOrgEndPts[p].A = Quantize(aEndPts[p].A, ms_aInfo[pEP->uMode].RGBAPrecWithP);
         aOrgEndPts[p].B = Quantize(aEndPts[p].B, ms_aInfo[pEP->uMode].RGBAPrecWithP);
+    #ifdef __GNUC_
+    #pragma GCC diagnostic pop
+    #endif
     }
 
     LDREndPntPair newEndPts1[BC7_MAX_REGIONS];
@@ -3487,8 +3505,8 @@ float D3DX_BC7::RoughMSE(EncodeParams* pEP, size_t uShape, size_t uIndexMode) no
 
     const uint8_t uIndexPrec = uIndexMode ? ms_aInfo[pEP->uMode].uIndexPrec2 : ms_aInfo[pEP->uMode].uIndexPrec;
     const uint8_t uIndexPrec2 = uIndexMode ? ms_aInfo[pEP->uMode].uIndexPrec : ms_aInfo[pEP->uMode].uIndexPrec2;
-    auto const uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
-    auto const uNumIndices2 = static_cast<const uint8_t>(1u << uIndexPrec2);
+    const auto uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
+    const auto uNumIndices2 = static_cast<const uint8_t>(1u << uIndexPrec2);
     size_t auPixIdx[NUM_PIXELS_PER_BLOCK];
     LDRColorA aPalette[BC7_MAX_REGIONS][BC7_MAX_INDICES];
 

DirectXTex/BCDirectCompute.cpp

@@ -101,8 +101,7 @@ GPUCompressBC::GPUCompressBC() noexcept :
     m_bc7_mode137(false),
     m_width(0),
     m_height(0)
-{
-}
+{}
 
 
 //-------------------------------------------------------------------------------------
@@ -264,7 +263,7 @@ HRESULT GPUCompressBC::Prepare(size_t width, size_t height, uint32_t flags, DXGI
     if (sizeInBytes >= UINT32_MAX)
         return HRESULT_E_ARITHMETIC_OVERFLOW;
 
-    auto const bufferSize = static_cast<size_t>(sizeInBytes);
+    const auto bufferSize = static_cast<size_t>(sizeInBytes);
 
     {
         D3D11_BUFFER_DESC desc = {};
@@ -459,7 +458,7 @@ HRESULT GPUCompressBC::Compress(const Image& srcImage, const Image& destImage)
     const size_t xblocks = std::max<size_t>(1, (m_width + 3) >> 2);
     const size_t yblocks = std::max<size_t>(1, (m_height + 3) >> 2);
 
-    auto const num_total_blocks = static_cast<UINT>(xblocks * yblocks);
+    const auto num_total_blocks = static_cast<UINT>(xblocks * yblocks);
     UINT num_blocks = num_total_blocks;
     UINT start_block_id = 0;
     while (num_blocks > 0)

DirectXTex/DDS.h

@@ -48,8 +48,9 @@ namespace DirectX
 #define DDS_ALPHA         0x00000002  // DDPF_ALPHA
 #define DDS_PAL8          0x00000020  // DDPF_PALETTEINDEXED8
 #define DDS_PAL8A         0x00000021  // DDPF_PALETTEINDEXED8 | DDPF_ALPHAPIXELS
+#define DDS_BUMPLUMINANCE 0x00040000  // DDPF_BUMPLUMINANCE
 #define DDS_BUMPDUDV      0x00080000  // DDPF_BUMPDUDV
-// DDS_BUMPLUMINANCE 0x00040000
+#define DDS_BUMPDUDVA     0x00080001  // DDPF_BUMPDUDV | DDPF_ALPHAPIXELS
 
 #ifndef MAKEFOURCC
 #define MAKEFOURCC(ch0, ch1, ch2, ch3) \
@@ -187,10 +188,13 @@ namespace DirectX
     DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_A2B10G10R10 =
     { sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000 };
 
-// We do not support the following legacy Direct3D 9 formats:
-// DDSPF_A2W10V10U10 = { sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDV, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000 };
-// DDSPF_L6V5U5 = { sizeof(DDS_PIXELFORMAT), DDS_BUMPLUMINANCE, 0, 16, 0x001f, 0x03e0, 0xfc00, 0 };
-// DDSPF_X8L8V8U8 = { sizeof(DDS_PIXELFORMAT), DDS_BUMPLUMINANCE, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0 };
+// The following legacy Direct3D 9 formats use 'mixed' signed & unsigned channels so requires special handling
+    DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_A2W10V10U10 =
+    { sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDVA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000 };
+    DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_L6V5U5 =
+    { sizeof(DDS_PIXELFORMAT), DDS_BUMPLUMINANCE, 0, 16, 0x001f, 0x03e0, 0xfc00, 0 };
+    DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_X8L8V8U8 =
+    { sizeof(DDS_PIXELFORMAT), DDS_BUMPLUMINANCE, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0 };
 
 // This indicates the DDS_HEADER_DXT10 extension is present (the format is in dxgiFormat)
     DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_DX10 =
@@ -288,4 +292,39 @@ namespace DirectX
     static_assert(sizeof(DDS_HEADER) == 124, "DDS Header size mismatch");
     static_assert(sizeof(DDS_HEADER_DXT10) == 20, "DDS DX10 Extended Header size mismatch");
 
+    constexpr size_t DDS_MIN_HEADER_SIZE = sizeof(uint32_t) + sizeof(DDS_HEADER);
+    constexpr size_t DDS_DX10_HEADER_SIZE = sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10);
+    static_assert(DDS_DX10_HEADER_SIZE > DDS_MIN_HEADER_SIZE, "DDS DX10 Header should be larger than standard header");
+
+} // namespace
+
+namespace Xbox
+{
+    DDSGLOBALCONST DirectX::DDS_PIXELFORMAT DDSPF_XBOX =
+    { sizeof(DirectX::DDS_PIXELFORMAT), DDS_FOURCC, MAKEFOURCC('X','B','O','X'), 0, 0, 0, 0, 0 };
+
+#pragma pack(push,1)
+
+    struct DDS_HEADER_XBOX
+        // Must match structure in XboxDDSTextureLoader module
+    {
+        DXGI_FORMAT dxgiFormat;
+        uint32_t    resourceDimension;
+        uint32_t    miscFlag; // see DDS_RESOURCE_MISC_FLAG
+        uint32_t    arraySize;
+        uint32_t    miscFlags2; // see DDS_MISC_FLAGS2
+        uint32_t    tileMode; // see XG_TILE_MODE / XG_SWIZZLE_MODE
+        uint32_t    baseAlignment;
+        uint32_t    dataSize;
+        uint32_t    xdkVer; // matching _XDK_VER / _GXDK_VER
+    };
+
+#pragma pack(pop)
+
+    static_assert(sizeof(DDS_HEADER_XBOX) == 36, "DDS XBOX Header size mismatch");
+    static_assert(sizeof(DDS_HEADER_XBOX) > sizeof(DirectX::DDS_HEADER_DXT10), "DDS XBOX Header should be larger than DX10 header");
+
+    constexpr size_t DDS_XBOX_HEADER_SIZE = sizeof(uint32_t) + sizeof(DirectX::DDS_HEADER) + sizeof(DDS_HEADER_XBOX);
+
+    constexpr uint32_t XBOX_TILEMODE_SCARLETT = 0x1000000;
 } // namespace

DirectXTex/DirectXTex.h

@@ -47,32 +47,49 @@ struct IWICImagingFactory;
 struct IWICMetadataQueryReader;
 #endif
 
-#define DIRECTX_TEX_VERSION 202
+#define DIRECTX_TEX_VERSION 207
 
+#if defined(_WIN32) && defined(DIRECTX_TEX_EXPORT)
+#ifdef __GNUC__
+#define DIRECTX_TEX_API __attribute__ ((dllexport))
+#else
+#define DIRECTX_TEX_API __declspec(dllexport)
+#endif
+#elif defined(_WIN32) && defined(DIRECTX_TEX_IMPORT)
+#ifdef __GNUC__
+#define DIRECTX_TEX_API __attribute__ ((dllimport))
+#else
+#define DIRECTX_TEX_API __declspec(dllimport)
+#endif
+#else
+#define DIRECTX_TEX_API
+#endif
 
 namespace DirectX
 {
 
     //---------------------------------------------------------------------------------
     // DXGI Format Utilities
-    constexpr bool __cdecl IsValid(_In_ DXGI_FORMAT fmt) noexcept;
-    bool __cdecl IsCompressed(_In_ DXGI_FORMAT fmt) noexcept;
-    bool __cdecl IsPacked(_In_ DXGI_FORMAT fmt) noexcept;
-    bool __cdecl IsVideo(_In_ DXGI_FORMAT fmt) noexcept;
-    bool __cdecl IsPlanar(_In_ DXGI_FORMAT fmt) noexcept;
-    bool __cdecl IsPalettized(_In_ DXGI_FORMAT fmt) noexcept;
-    bool __cdecl IsDepthStencil(_In_ DXGI_FORMAT fmt) noexcept;
-    bool __cdecl IsSRGB(_In_ DXGI_FORMAT fmt) noexcept;
-    bool __cdecl IsBGR(_In_ DXGI_FORMAT fmt) noexcept;
-    bool __cdecl IsTypeless(_In_ DXGI_FORMAT fmt, _In_ bool partialTypeless = true) noexcept;
+    DIRECTX_TEX_API constexpr bool __cdecl IsValid(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API bool __cdecl IsCompressed(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API bool __cdecl IsPacked(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API bool __cdecl IsVideo(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API bool __cdecl IsPlanar(_In_ DXGI_FORMAT fmt, _In_ bool isd3d12 = false) noexcept;
+    DIRECTX_TEX_API bool __cdecl IsPalettized(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API bool __cdecl IsDepthStencil(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API bool __cdecl IsSRGB(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API bool __cdecl IsBGR(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API bool __cdecl IsTypeless(_In_ DXGI_FORMAT fmt, _In_ bool partialTypeless = true) noexcept;
 
-    bool __cdecl HasAlpha(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API bool __cdecl HasAlpha(_In_ DXGI_FORMAT fmt) noexcept;
 
-    size_t __cdecl BitsPerPixel(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API size_t __cdecl BitsPerPixel(_In_ DXGI_FORMAT fmt) noexcept;
 
-    size_t __cdecl BitsPerColor(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API size_t __cdecl BitsPerColor(_In_ DXGI_FORMAT fmt) noexcept;
 
-    enum FORMAT_TYPE
+    DIRECTX_TEX_API size_t __cdecl BytesPerBlock(_In_ DXGI_FORMAT fmt) noexcept;
+
+    enum FORMAT_TYPE : uint32_t
     {
         FORMAT_TYPE_TYPELESS,
         FORMAT_TYPE_FLOAT,
@@ -82,9 +99,9 @@ namespace DirectX
         FORMAT_TYPE_SINT,
     };
 
-    FORMAT_TYPE __cdecl FormatDataType(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API FORMAT_TYPE __cdecl FormatDataType(_In_ DXGI_FORMAT fmt) noexcept;
 
-    enum CP_FLAGS : unsigned long
+    enum CP_FLAGS : uint32_t
     {
         CP_FLAGS_NONE = 0x0,
         // Normal operation
@@ -115,23 +132,26 @@ namespace DirectX
 
         CP_FLAGS_8BPP = 0x40000,
         // Override with a legacy 8 bits-per-pixel format size
+
+        CP_FLAGS_LIMIT_4GB = 0x10000000,
+        // Don't allow pixel allocations in excess of 4GB (always true for 32-bit)
     };
 
-    HRESULT __cdecl ComputePitch(
+    DIRECTX_TEX_API HRESULT __cdecl ComputePitch(
         _In_ DXGI_FORMAT fmt, _In_ size_t width, _In_ size_t height,
         _Out_ size_t& rowPitch, _Out_ size_t& slicePitch, _In_ CP_FLAGS flags = CP_FLAGS_NONE) noexcept;
 
-    size_t __cdecl ComputeScanlines(_In_ DXGI_FORMAT fmt, _In_ size_t height) noexcept;
+    DIRECTX_TEX_API size_t __cdecl ComputeScanlines(_In_ DXGI_FORMAT fmt, _In_ size_t height) noexcept;
 
-    DXGI_FORMAT __cdecl MakeSRGB(_In_ DXGI_FORMAT fmt) noexcept;
-    DXGI_FORMAT __cdecl MakeLinear(_In_ DXGI_FORMAT fmt) noexcept;
-    DXGI_FORMAT __cdecl MakeTypeless(_In_ DXGI_FORMAT fmt) noexcept;
-    DXGI_FORMAT __cdecl MakeTypelessUNORM(_In_ DXGI_FORMAT fmt) noexcept;
-    DXGI_FORMAT __cdecl MakeTypelessFLOAT(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API DXGI_FORMAT __cdecl MakeSRGB(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API DXGI_FORMAT __cdecl MakeLinear(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API DXGI_FORMAT __cdecl MakeTypeless(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API DXGI_FORMAT __cdecl MakeTypelessUNORM(_In_ DXGI_FORMAT fmt) noexcept;
+    DIRECTX_TEX_API DXGI_FORMAT __cdecl MakeTypelessFLOAT(_In_ DXGI_FORMAT fmt) noexcept;
 
     //---------------------------------------------------------------------------------
     // Texture metadata
-    enum TEX_DIMENSION
+    enum TEX_DIMENSION : uint32_t
         // Subset here matches D3D10_RESOURCE_DIMENSION and D3D11_RESOURCE_DIMENSION
     {
         TEX_DIMENSION_TEXTURE1D = 2,
@@ -139,18 +159,18 @@ namespace DirectX
         TEX_DIMENSION_TEXTURE3D = 4,
     };
 
-    enum TEX_MISC_FLAG : unsigned long
+    enum TEX_MISC_FLAG : uint32_t
         // Subset here matches D3D10_RESOURCE_MISC_FLAG and D3D11_RESOURCE_MISC_FLAG
     {
         TEX_MISC_TEXTURECUBE = 0x4L,
     };
 
-    enum TEX_MISC_FLAG2 : unsigned long
+    enum TEX_MISC_FLAG2 : uint32_t
     {
         TEX_MISC2_ALPHA_MODE_MASK = 0x7L,
     };
 
-    enum TEX_ALPHA_MODE
+    enum TEX_ALPHA_MODE : uint32_t
         // Matches DDS_ALPHA_MODE, encoded in MISC_FLAGS2
     {
         TEX_ALPHA_MODE_UNKNOWN = 0,
@@ -160,7 +180,7 @@ namespace DirectX
         TEX_ALPHA_MODE_CUSTOM = 4,
     };
 
-    struct TexMetadata
+    struct DIRECTX_TEX_API TexMetadata
     {
         size_t          width;
         size_t          height;     // Should be 1 for 1D textures
@@ -172,7 +192,7 @@ namespace DirectX
         DXGI_FORMAT     format;
         TEX_DIMENSION   dimension;
 
-        size_t __cdecl ComputeIndex(_In_ size_t mip, _In_ size_t item, _In_ size_t slice) const noexcept;
+        size_t __cdecl ComputeIndex(size_t mip, size_t item, size_t slice) const noexcept;
             // Returns size_t(-1) to indicate an out-of-range error
 
         bool __cdecl IsCubemap() const noexcept { return (miscFlags & TEX_MISC_TEXTURECUBE) != 0; }
@@ -185,9 +205,13 @@ namespace DirectX
 
         bool __cdecl IsVolumemap() const noexcept { return (dimension == TEX_DIMENSION_TEXTURE3D); }
             // Helper for dimension
+
+        uint32_t __cdecl CalculateSubresource(size_t mip, size_t item) const noexcept;
+        uint32_t __cdecl CalculateSubresource(size_t mip, size_t item, size_t plane) const noexcept;
+            // Returns size_t(-1) to indicate an out-of-range error
     };
 
-    struct DDSMetaData
+    struct DIRECTX_TEX_API DDSMetaData
     {
         uint32_t    size;           // DDPIXELFORMAT.dwSize
         uint32_t    flags;          // DDPIXELFORMAT.dwFlags
@@ -201,7 +225,7 @@ namespace DirectX
         bool __cdecl IsDX10() const noexcept { return (fourCC == 0x30315844); }
     };
 
-    enum DDS_FLAGS : unsigned long
+    enum DDS_FLAGS : uint32_t
     {
         DDS_FLAGS_NONE = 0x0,
 
@@ -229,6 +253,9 @@ namespace DirectX
         DDS_FLAGS_PERMISSIVE = 0x80,
         // Allow some file variants due to common bugs in the header written by various leagcy DDS writers
 
+        DDS_FLAGS_IGNORE_MIPS = 0x100,
+        // Allow some files to be read that have incorrect mipcount values in the header by only reading the top-level mip
+
         DDS_FLAGS_FORCE_DX10_EXT = 0x10000,
         // Always use the 'DX10' header extension for DDS writer (i.e. don't try to write DX9 compatible DDS files)
 
@@ -245,7 +272,7 @@ namespace DirectX
         // Enables the loader to read large dimension .dds files (i.e. greater than known hardware requirements)
     };
 
-    enum TGA_FLAGS : unsigned long
+    enum TGA_FLAGS : uint32_t
     {
         TGA_FLAGS_NONE = 0x0,
 
@@ -268,7 +295,7 @@ namespace DirectX
         // If no colorspace is specified in TGA 2.0 metadata, assume sRGB
     };
 
-    enum WIC_FLAGS : unsigned long
+    enum WIC_FLAGS : uint32_t
     {
         WIC_FLAGS_NONE = 0x0,
 
@@ -312,50 +339,50 @@ namespace DirectX
             // Filtering mode to use for any required image resizing (only needed when loading arrays of differently sized images; defaults to Fant)
     };
 
-    HRESULT __cdecl GetMetadataFromDDSMemory(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSMemory(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _In_ DDS_FLAGS flags,
         _Out_ TexMetadata& metadata) noexcept;
-    HRESULT __cdecl GetMetadataFromDDSFile(
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSFile(
         _In_z_ const wchar_t* szFile,
         _In_ DDS_FLAGS flags,
         _Out_ TexMetadata& metadata) noexcept;
 
-    HRESULT __cdecl GetMetadataFromDDSMemoryEx(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSMemoryEx(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _In_ DDS_FLAGS flags,
         _Out_ TexMetadata& metadata,
         _Out_opt_ DDSMetaData* ddPixelFormat) noexcept;
-    HRESULT __cdecl GetMetadataFromDDSFileEx(
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSFileEx(
         _In_z_ const wchar_t* szFile,
         _In_ DDS_FLAGS flags,
         _Out_ TexMetadata& metadata,
         _Out_opt_ DDSMetaData* ddPixelFormat) noexcept;
 
-    HRESULT __cdecl GetMetadataFromHDRMemory(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromHDRMemory(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _Out_ TexMetadata& metadata) noexcept;
-    HRESULT __cdecl GetMetadataFromHDRFile(
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromHDRFile(
         _In_z_ const wchar_t* szFile,
         _Out_ TexMetadata& metadata) noexcept;
 
-    HRESULT __cdecl GetMetadataFromTGAMemory(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromTGAMemory(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _In_ TGA_FLAGS flags,
         _Out_ TexMetadata& metadata) noexcept;
-    HRESULT __cdecl GetMetadataFromTGAFile(
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromTGAFile(
         _In_z_ const wchar_t* szFile,
         _In_ TGA_FLAGS flags,
         _Out_ TexMetadata& metadata) noexcept;
 
 #ifdef _WIN32
-    HRESULT __cdecl GetMetadataFromWICMemory(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromWICMemory(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _In_ WIC_FLAGS flags,
         _Out_ TexMetadata& metadata,
         _In_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
 
-    HRESULT __cdecl GetMetadataFromWICFile(
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromWICFile(
         _In_z_ const wchar_t* szFile,
         _In_ WIC_FLAGS flags,
         _Out_ TexMetadata& metadata,
@@ -363,13 +390,41 @@ namespace DirectX
 #endif
 
     // Compatability helpers
-    HRESULT __cdecl GetMetadataFromTGAMemory(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromTGAMemory(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _Out_ TexMetadata& metadata) noexcept;
-    HRESULT __cdecl GetMetadataFromTGAFile(
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromTGAFile(
         _In_z_ const wchar_t* szFile,
         _Out_ TexMetadata& metadata) noexcept;
 
+#ifdef __cpp_lib_byte
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSMemory(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _In_ DDS_FLAGS flags,
+        _Out_ TexMetadata& metadata) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSMemoryEx(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _In_ DDS_FLAGS flags,
+        _Out_ TexMetadata& metadata,
+        _Out_opt_ DDSMetaData* ddPixelFormat) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromHDRMemory(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _Out_ TexMetadata& metadata) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromTGAMemory(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _In_ TGA_FLAGS flags,
+        _Out_ TexMetadata& metadata) noexcept;
+
+#ifdef _WIN32
+    DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromWICMemory(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _In_ WIC_FLAGS flags,
+        _Out_ TexMetadata& metadata,
+        _In_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
+#endif
+#endif // __cpp_lib_byte
+
+
     //---------------------------------------------------------------------------------
     // Bitmap image container
     struct Image
@@ -382,13 +437,17 @@ namespace DirectX
         uint8_t*    pixels;
     };
 
-    class ScratchImage
+    class DIRECTX_TEX_API ScratchImage
     {
     public:
         ScratchImage() noexcept
-            : m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr) {}
+            : m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr)
+        {}
         ScratchImage(ScratchImage&& moveFrom) noexcept
-            : m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr) { *this = std::move(moveFrom); }
+            : m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr)
+        {
+            *this = std::move(moveFrom);
+        }
         ~ScratchImage() { Release(); }
 
         ScratchImage& __cdecl operator= (ScratchImage&& moveFrom) noexcept;
@@ -433,7 +492,7 @@ namespace DirectX
 
     //---------------------------------------------------------------------------------
     // Memory blob (allocated buffer pointer is always 16-byte aligned)
-    class Blob
+    class DIRECTX_TEX_API Blob
     {
     public:
         Blob() noexcept : m_buffer(nullptr), m_size(0) {}
@@ -449,7 +508,10 @@ namespace DirectX
 
         void __cdecl Release() noexcept;
 
-        void *__cdecl GetBufferPointer() const noexcept { return m_buffer; }
+        uint8_t* __cdecl GetBufferPointer() const noexcept { return m_buffer; }
+
+        const uint8_t* __cdecl GetConstBufferPointer() const noexcept { return m_buffer; }
+
         size_t __cdecl GetBufferSize() const noexcept { return m_size; }
 
         HRESULT __cdecl Resize(size_t size) noexcept;
@@ -459,105 +521,150 @@ namespace DirectX
             // Shorten size without reallocation
 
     private:
-        void*   m_buffer;
+        uint8_t* m_buffer;
         size_t   m_size;
     };
 
+    //---------------------------------------------------------------------------------
+    // Tiling utilities
+
+    struct DIRECTX_TEX_API TileShape
+    {
+        size_t width;
+        size_t height;
+        size_t depth;
+
+        TileShape() = default;
+
+    #if defined(__d3d11_2_h__) || defined(__d3d11_x_h__)
+        TileShape(const D3D11_TILE_SHAPE& tile) :
+            width(tile.WidthInTexels),
+            height(tile.HeightInTexels),
+            depth(tile.DepthInTexels)
+        {}
+
+        void GetTileShape11(D3D11_TILE_SHAPE& tile) const
+        {
+            tile.WidthInTexels = static_cast<UINT>(width);
+            tile.HeightInTexels = static_cast<UINT>(height);
+            tile.DepthInTexels = static_cast<UINT>(depth);
+        }
+    #endif
+
+    #if defined(__d3d12_h__) || defined(__d3d12_x_h__) || defined(__XBOX_D3D12_X__)
+        TileShape(const D3D12_TILE_SHAPE& tile) :
+            width(tile.WidthInTexels),
+            height(tile.HeightInTexels),
+            depth(tile.DepthInTexels)
+        {}
+
+        void GetTileShape12(D3D12_TILE_SHAPE& tile) const
+        {
+            tile.WidthInTexels = static_cast<UINT>(width);
+            tile.HeightInTexels = static_cast<UINT>(height);
+            tile.DepthInTexels = static_cast<UINT>(depth);
+        }
+    #endif
+    };
+
+    DIRECTX_TEX_API HRESULT __cdecl ComputeTileShape(_In_ DXGI_FORMAT fmt, _In_ TEX_DIMENSION dimension,
+        _Out_ TileShape& tiling) noexcept;
+
     //---------------------------------------------------------------------------------
     // Image I/O
 
     // DDS operations
-    HRESULT __cdecl LoadFromDDSMemory(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSMemory(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _In_ DDS_FLAGS flags,
         _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
-    HRESULT __cdecl LoadFromDDSFile(
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSFile(
         _In_z_ const wchar_t* szFile,
         _In_ DDS_FLAGS flags,
         _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
 
-    HRESULT __cdecl LoadFromDDSMemoryEx(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSMemoryEx(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _In_ DDS_FLAGS flags,
         _Out_opt_ TexMetadata* metadata,
         _Out_opt_ DDSMetaData* ddPixelFormat,
         _Out_ ScratchImage& image) noexcept;
-    HRESULT __cdecl LoadFromDDSFileEx(
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSFileEx(
         _In_z_ const wchar_t* szFile,
         _In_ DDS_FLAGS flags,
         _Out_opt_ TexMetadata* metadata,
         _Out_opt_ DDSMetaData* ddPixelFormat,
         _Out_ ScratchImage& image) noexcept;
 
-    HRESULT __cdecl SaveToDDSMemory(
+    DIRECTX_TEX_API HRESULT __cdecl SaveToDDSMemory(
         _In_ const Image& image,
         _In_ DDS_FLAGS flags,
         _Out_ Blob& blob) noexcept;
-    HRESULT __cdecl SaveToDDSMemory(
+    DIRECTX_TEX_API HRESULT __cdecl SaveToDDSMemory(
         _In_reads_(nimages) const Image* images, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ DDS_FLAGS flags,
         _Out_ Blob& blob) noexcept;
 
-    HRESULT __cdecl SaveToDDSFile(_In_ const Image& image, _In_ DDS_FLAGS flags, _In_z_ const wchar_t* szFile) noexcept;
-    HRESULT __cdecl SaveToDDSFile(
+    DIRECTX_TEX_API HRESULT __cdecl SaveToDDSFile(_In_ const Image& image, _In_ DDS_FLAGS flags, _In_z_ const wchar_t* szFile) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl SaveToDDSFile(
         _In_reads_(nimages) const Image* images, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ DDS_FLAGS flags, _In_z_ const wchar_t* szFile) noexcept;
 
     // HDR operations
-    HRESULT __cdecl LoadFromHDRMemory(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromHDRMemory(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
-    HRESULT __cdecl LoadFromHDRFile(
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromHDRFile(
         _In_z_ const wchar_t* szFile,
         _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
 
-    HRESULT __cdecl SaveToHDRMemory(_In_ const Image& image, _Out_ Blob& blob) noexcept;
-    HRESULT __cdecl SaveToHDRFile(_In_ const Image& image, _In_z_ const wchar_t* szFile) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl SaveToHDRMemory(_In_ const Image& image, _Out_ Blob& blob) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl SaveToHDRFile(_In_ const Image& image, _In_z_ const wchar_t* szFile) noexcept;
 
     // TGA operations
-    HRESULT __cdecl LoadFromTGAMemory(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromTGAMemory(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _In_ TGA_FLAGS flags,
         _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
-    HRESULT __cdecl LoadFromTGAFile(
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromTGAFile(
         _In_z_ const wchar_t* szFile,
         _In_ TGA_FLAGS flags,
         _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
 
-    HRESULT __cdecl SaveToTGAMemory(_In_ const Image& image,
+    DIRECTX_TEX_API HRESULT __cdecl SaveToTGAMemory(_In_ const Image& image,
         _In_ TGA_FLAGS flags,
         _Out_ Blob& blob, _In_opt_ const TexMetadata* metadata = nullptr) noexcept;
-    HRESULT __cdecl SaveToTGAFile(_In_ const Image& image,
+    DIRECTX_TEX_API HRESULT __cdecl SaveToTGAFile(_In_ const Image& image,
         _In_ TGA_FLAGS flags,
         _In_z_ const wchar_t* szFile, _In_opt_ const TexMetadata* metadata = nullptr) noexcept;
 
     // WIC operations
 #ifdef _WIN32
-    HRESULT __cdecl LoadFromWICMemory(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromWICMemory(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _In_ WIC_FLAGS flags,
         _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image,
         _In_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
-    HRESULT __cdecl LoadFromWICFile(
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromWICFile(
         _In_z_ const wchar_t* szFile, _In_ WIC_FLAGS flags,
         _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image,
         _In_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
 
-    HRESULT __cdecl SaveToWICMemory(
+    DIRECTX_TEX_API HRESULT __cdecl SaveToWICMemory(
         _In_ const Image& image, _In_ WIC_FLAGS flags, _In_ REFGUID guidContainerFormat,
         _Out_ Blob& blob, _In_opt_ const GUID* targetFormat = nullptr,
         _In_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
-    HRESULT __cdecl SaveToWICMemory(
+    DIRECTX_TEX_API HRESULT __cdecl SaveToWICMemory(
         _In_count_(nimages) const Image* images, _In_ size_t nimages,
         _In_ WIC_FLAGS flags, _In_ REFGUID guidContainerFormat,
         _Out_ Blob& blob, _In_opt_ const GUID* targetFormat = nullptr,
         _In_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
 
-    HRESULT __cdecl SaveToWICFile(
+    DIRECTX_TEX_API HRESULT __cdecl SaveToWICFile(
         _In_ const Image& image, _In_ WIC_FLAGS flags, _In_ REFGUID guidContainerFormat,
         _In_z_ const wchar_t* szFile, _In_opt_ const GUID* targetFormat = nullptr,
         _In_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
-    HRESULT __cdecl SaveToWICFile(
+    DIRECTX_TEX_API HRESULT __cdecl SaveToWICFile(
         _In_count_(nimages) const Image* images, _In_ size_t nimages,
         _In_ WIC_FLAGS flags, _In_ REFGUID guidContainerFormat,
         _In_z_ const wchar_t* szFile, _In_opt_ const GUID* targetFormat = nullptr,
@@ -565,20 +672,48 @@ namespace DirectX
 #endif // WIN32
 
     // Compatability helpers
-    HRESULT __cdecl LoadFromTGAMemory(
-        _In_reads_bytes_(size) const void* pSource, _In_ size_t size,
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromTGAMemory(
+        _In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
         _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
-    HRESULT __cdecl LoadFromTGAFile(
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromTGAFile(
         _In_z_ const wchar_t* szFile,
         _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
 
-    HRESULT __cdecl SaveToTGAMemory(_In_ const Image& image, _Out_ Blob& blob, _In_opt_ const TexMetadata* metadata = nullptr) noexcept;
-    HRESULT __cdecl SaveToTGAFile(_In_ const Image& image, _In_z_ const wchar_t* szFile, _In_opt_ const TexMetadata* metadata = nullptr) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl SaveToTGAMemory(_In_ const Image& image, _Out_ Blob& blob, _In_opt_ const TexMetadata* metadata = nullptr) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl SaveToTGAFile(_In_ const Image& image, _In_z_ const wchar_t* szFile, _In_opt_ const TexMetadata* metadata = nullptr) noexcept;
+
+#ifdef __cpp_lib_byte
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSMemory(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _In_ DDS_FLAGS flags,
+        _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSMemoryEx(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _In_ DDS_FLAGS flags,
+        _Out_opt_ TexMetadata* metadata,
+        _Out_opt_ DDSMetaData* ddPixelFormat,
+        _Out_ ScratchImage& image) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromHDRMemory(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromTGAMemory(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _In_ TGA_FLAGS flags,
+        _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
+
+#ifdef _WIN32
+    DIRECTX_TEX_API HRESULT __cdecl LoadFromWICMemory(
+        _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size,
+        _In_ WIC_FLAGS flags,
+        _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image,
+        _In_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
+#endif
+#endif // __cpp_lib_byte
 
     //---------------------------------------------------------------------------------
     // Texture conversion, resizing, mipmap generation, and block compression
 
-    enum TEX_FR_FLAGS : unsigned long
+    enum TEX_FR_FLAGS : uint32_t
     {
         TEX_FR_ROTATE0 = 0x0,
         TEX_FR_ROTATE90 = 0x1,
@@ -589,14 +724,14 @@ namespace DirectX
     };
 
 #ifdef _WIN32
-    HRESULT __cdecl FlipRotate(_In_ const Image& srcImage, _In_ TEX_FR_FLAGS flags, _Out_ ScratchImage& image) noexcept;
-    HRESULT __cdecl FlipRotate(
+    DIRECTX_TEX_API HRESULT __cdecl FlipRotate(_In_ const Image& srcImage, _In_ TEX_FR_FLAGS flags, _Out_ ScratchImage& image) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl FlipRotate(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ TEX_FR_FLAGS flags, _Out_ ScratchImage& result) noexcept;
         // Flip and/or rotate image
 #endif
 
-    enum TEX_FILTER_FLAGS : unsigned long
+    enum TEX_FILTER_FLAGS : uint32_t
     {
         TEX_FILTER_DEFAULT = 0,
 
@@ -650,15 +785,15 @@ namespace DirectX
         // Forces use of the WIC path even when logic would have picked a non-WIC path when both are an option
     };
 
-    constexpr unsigned long TEX_FILTER_DITHER_MASK = 0xF0000;
-    constexpr unsigned long TEX_FILTER_MODE_MASK = 0xF00000;
-    constexpr unsigned long TEX_FILTER_SRGB_MASK = 0xF000000;
+    constexpr uint32_t TEX_FILTER_DITHER_MASK = 0xF0000;
+    constexpr uint32_t TEX_FILTER_MODE_MASK = 0xF00000;
+    constexpr uint32_t TEX_FILTER_SRGB_MASK = 0xF000000;
 
-    HRESULT __cdecl Resize(
+    DIRECTX_TEX_API HRESULT __cdecl Resize(
         _In_ const Image& srcImage, _In_ size_t width, _In_ size_t height,
         _In_ TEX_FILTER_FLAGS filter,
         _Out_ ScratchImage& image) noexcept;
-    HRESULT __cdecl Resize(
+    DIRECTX_TEX_API HRESULT __cdecl Resize(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ size_t width, _In_ size_t height, _In_ TEX_FILTER_FLAGS filter, _Out_ ScratchImage& result) noexcept;
         // Resize the image to width x height. Defaults to Fant filtering.
@@ -673,53 +808,53 @@ namespace DirectX
         float            threshold;
     };
 
-    HRESULT __cdecl Convert(
+    DIRECTX_TEX_API HRESULT __cdecl Convert(
         _In_ const Image& srcImage, _In_ DXGI_FORMAT format, _In_ TEX_FILTER_FLAGS filter, _In_ float threshold,
         _Out_ ScratchImage& image) noexcept;
-    HRESULT __cdecl Convert(
+    DIRECTX_TEX_API HRESULT __cdecl Convert(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ DXGI_FORMAT format, _In_ TEX_FILTER_FLAGS filter, _In_ float threshold, _Out_ ScratchImage& result) noexcept;
 
-    HRESULT __cdecl ConvertEx(
+    DIRECTX_TEX_API HRESULT __cdecl ConvertEx(
         _In_ const Image& srcImage, _In_ DXGI_FORMAT format, _In_ const ConvertOptions& options,
         _Out_ ScratchImage& image,
         _In_ std::function<bool __cdecl(size_t, size_t)> statusCallBack = nullptr);
-    HRESULT __cdecl ConvertEx(
+    DIRECTX_TEX_API HRESULT __cdecl ConvertEx(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ DXGI_FORMAT format, _In_ const ConvertOptions& options, _Out_ ScratchImage& result,
         _In_ std::function<bool __cdecl(size_t, size_t)> statusCallBack = nullptr);
         // Convert the image to a new format
 
-    HRESULT __cdecl ConvertToSinglePlane(_In_ const Image& srcImage, _Out_ ScratchImage& image) noexcept;
-    HRESULT __cdecl ConvertToSinglePlane(
+    DIRECTX_TEX_API HRESULT __cdecl ConvertToSinglePlane(_In_ const Image& srcImage, _Out_ ScratchImage& image) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl ConvertToSinglePlane(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _Out_ ScratchImage& image) noexcept;
         // Converts the image from a planar format to an equivalent non-planar format
 
-    HRESULT __cdecl GenerateMipMaps(
+    DIRECTX_TEX_API HRESULT __cdecl GenerateMipMaps(
         _In_ const Image& baseImage, _In_ TEX_FILTER_FLAGS filter, _In_ size_t levels,
         _Inout_ ScratchImage& mipChain, _In_ bool allow1D = false) noexcept;
-    HRESULT __cdecl GenerateMipMaps(
+    DIRECTX_TEX_API HRESULT __cdecl GenerateMipMaps(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ TEX_FILTER_FLAGS filter, _In_ size_t levels, _Inout_ ScratchImage& mipChain);
         // levels of '0' indicates a full mipchain, otherwise is generates that number of total levels (including the source base image)
         // Defaults to Fant filtering which is equivalent to a box filter
 
-    HRESULT __cdecl GenerateMipMaps3D(
+    DIRECTX_TEX_API HRESULT __cdecl GenerateMipMaps3D(
         _In_reads_(depth) const Image* baseImages, _In_ size_t depth, _In_ TEX_FILTER_FLAGS filter, _In_ size_t levels,
         _Out_ ScratchImage& mipChain) noexcept;
-    HRESULT __cdecl GenerateMipMaps3D(
+    DIRECTX_TEX_API HRESULT __cdecl GenerateMipMaps3D(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ TEX_FILTER_FLAGS filter, _In_ size_t levels, _Out_ ScratchImage& mipChain);
         // levels of '0' indicates a full mipchain, otherwise is generates that number of total levels (including the source base image)
         // Defaults to Fant filtering which is equivalent to a box filter
 
-    HRESULT __cdecl ScaleMipMapsAlphaForCoverage(
+    DIRECTX_TEX_API HRESULT __cdecl ScaleMipMapsAlphaForCoverage(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata, _In_ size_t item,
         _In_ float alphaReference, _Inout_ ScratchImage& mipChain) noexcept;
 
 
-    enum TEX_PMALPHA_FLAGS : unsigned long
+    enum TEX_PMALPHA_FLAGS : uint32_t
     {
         TEX_PMALPHA_DEFAULT = 0,
 
@@ -736,13 +871,13 @@ namespace DirectX
         // if the output format type is IsSRGB(), then SRGB_OUT is on by default
     };
 
-    HRESULT __cdecl PremultiplyAlpha(_In_ const Image& srcImage, _In_ TEX_PMALPHA_FLAGS flags, _Out_ ScratchImage& image) noexcept;
-    HRESULT __cdecl PremultiplyAlpha(
+    DIRECTX_TEX_API HRESULT __cdecl PremultiplyAlpha(_In_ const Image& srcImage, _In_ TEX_PMALPHA_FLAGS flags, _Out_ ScratchImage& image) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl PremultiplyAlpha(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ TEX_PMALPHA_FLAGS flags, _Out_ ScratchImage& result) noexcept;
         // Converts to/from a premultiplied alpha version of the texture
 
-    enum TEX_COMPRESS_FLAGS : unsigned long
+    enum TEX_COMPRESS_FLAGS : uint32_t
     {
         TEX_COMPRESS_DEFAULT = 0,
 
@@ -784,51 +919,51 @@ namespace DirectX
         float              alphaWeight;
     };
 
-    HRESULT __cdecl Compress(
+    DIRECTX_TEX_API HRESULT __cdecl Compress(
         _In_ const Image& srcImage, _In_ DXGI_FORMAT format, _In_ TEX_COMPRESS_FLAGS compress, _In_ float threshold,
         _Out_ ScratchImage& cImage) noexcept;
-    HRESULT __cdecl Compress(
+    DIRECTX_TEX_API HRESULT __cdecl Compress(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ DXGI_FORMAT format, _In_ TEX_COMPRESS_FLAGS compress, _In_ float threshold, _Out_ ScratchImage& cImages) noexcept;
         // Note that threshold is only used by BC1. TEX_THRESHOLD_DEFAULT is a typical value to use
 
-    HRESULT __cdecl CompressEx(
+    DIRECTX_TEX_API HRESULT __cdecl CompressEx(
         _In_ const Image& srcImage, _In_ DXGI_FORMAT format, _In_ const CompressOptions& options,
         _Out_ ScratchImage& cImage,
         _In_ std::function<bool __cdecl(size_t, size_t)> statusCallBack = nullptr);
-    HRESULT __cdecl CompressEx(
+    DIRECTX_TEX_API HRESULT __cdecl CompressEx(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ DXGI_FORMAT format, _In_ const CompressOptions& options, _Out_ ScratchImage& cImages,
         _In_ std::function<bool __cdecl(size_t, size_t)> statusCallBack = nullptr);
 
 #if defined(__d3d11_h__) || defined(__d3d11_x_h__)
-    HRESULT __cdecl Compress(
+    DIRECTX_TEX_API HRESULT __cdecl Compress(
         _In_ ID3D11Device* pDevice, _In_ const Image& srcImage, _In_ DXGI_FORMAT format, _In_ TEX_COMPRESS_FLAGS compress,
         _In_ float alphaWeight, _Out_ ScratchImage& image) noexcept;
-    HRESULT __cdecl Compress(
+    DIRECTX_TEX_API HRESULT __cdecl Compress(
         _In_ ID3D11Device* pDevice, _In_ const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ DXGI_FORMAT format, _In_ TEX_COMPRESS_FLAGS compress, _In_ float alphaWeight, _Out_ ScratchImage& cImages) noexcept;
         // DirectCompute-based compression (alphaWeight is only used by BC7. 1.0 is the typical value to use)
 
-    HRESULT __cdecl CompressEx(
+    DIRECTX_TEX_API HRESULT __cdecl CompressEx(
         _In_ ID3D11Device* pDevice, _In_ const Image& srcImage, _In_ DXGI_FORMAT format, _In_ const CompressOptions& options,
         _Out_ ScratchImage& image,
         _In_ std::function<bool __cdecl(size_t, size_t)> statusCallBack = nullptr);
-    HRESULT __cdecl CompressEx(
+    DIRECTX_TEX_API HRESULT __cdecl CompressEx(
         _In_ ID3D11Device* pDevice, _In_ const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ DXGI_FORMAT format, _In_ const CompressOptions& options, _Out_ ScratchImage& cImages,
         _In_ std::function<bool __cdecl(size_t, size_t)> statusCallBack = nullptr);
 #endif
 
-    HRESULT __cdecl Decompress(_In_ const Image& cImage, _In_ DXGI_FORMAT format, _Out_ ScratchImage& image) noexcept;
-    HRESULT __cdecl Decompress(
+    DIRECTX_TEX_API HRESULT __cdecl Decompress(_In_ const Image& cImage, _In_ DXGI_FORMAT format, _Out_ ScratchImage& image) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl Decompress(
         _In_reads_(nimages) const Image* cImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ DXGI_FORMAT format, _Out_ ScratchImage& images) noexcept;
 
     //---------------------------------------------------------------------------------
     // Normal map operations
 
-    enum CNMAP_FLAGS : unsigned long
+    enum CNMAP_FLAGS : uint32_t
     {
         CNMAP_DEFAULT = 0,
 
@@ -852,17 +987,17 @@ namespace DirectX
         // Computes a crude occlusion term stored in the alpha channel
     };
 
-    HRESULT __cdecl ComputeNormalMap(
+    DIRECTX_TEX_API HRESULT __cdecl ComputeNormalMap(
         _In_ const Image& srcImage, _In_ CNMAP_FLAGS flags, _In_ float amplitude,
         _In_ DXGI_FORMAT format, _Out_ ScratchImage& normalMap) noexcept;
-    HRESULT __cdecl ComputeNormalMap(
+    DIRECTX_TEX_API HRESULT __cdecl ComputeNormalMap(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ CNMAP_FLAGS flags, _In_ float amplitude, _In_ DXGI_FORMAT format, _Out_ ScratchImage& normalMaps) noexcept;
 
     //---------------------------------------------------------------------------------
     // Misc image operations
 
-    struct Rect
+    struct DIRECTX_TEX_API Rect
     {
         size_t x;
         size_t y;
@@ -873,11 +1008,11 @@ namespace DirectX
         Rect(size_t _x, size_t _y, size_t _w, size_t _h) noexcept : x(_x), y(_y), w(_w), h(_h) {}
     };
 
-    HRESULT __cdecl CopyRectangle(
+    DIRECTX_TEX_API HRESULT __cdecl CopyRectangle(
         _In_ const Image& srcImage, _In_ const Rect& srcRect, _In_ const Image& dstImage,
         _In_ TEX_FILTER_FLAGS filter, _In_ size_t xOffset, _In_ size_t yOffset) noexcept;
 
-    enum CMSE_FLAGS : unsigned long
+    enum CMSE_FLAGS : uint32_t
     {
         CMSE_DEFAULT = 0,
 
@@ -896,21 +1031,21 @@ namespace DirectX
         // Indicates that image should be scaled and biased before comparison (i.e. UNORM -> SNORM)
     };
 
-    HRESULT __cdecl ComputeMSE(_In_ const Image& image1, _In_ const Image& image2, _Out_ float& mse, _Out_writes_opt_(4) float* mseV, _In_ CMSE_FLAGS flags = CMSE_DEFAULT) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl ComputeMSE(_In_ const Image& image1, _In_ const Image& image2, _Out_ float& mse, _Out_writes_opt_(4) float* mseV, _In_ CMSE_FLAGS flags = CMSE_DEFAULT) noexcept;
 
-    HRESULT __cdecl EvaluateImage(
+    DIRECTX_TEX_API HRESULT __cdecl EvaluateImage(
         _In_ const Image& image,
         _In_ std::function<void __cdecl(_In_reads_(width) const XMVECTOR* pixels, size_t width, size_t y)> pixelFunc);
-    HRESULT __cdecl EvaluateImage(
+    DIRECTX_TEX_API HRESULT __cdecl EvaluateImage(
         _In_reads_(nimages) const Image* images, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ std::function<void __cdecl(_In_reads_(width) const XMVECTOR* pixels, size_t width, size_t y)> pixelFunc);
 
-    HRESULT __cdecl TransformImage(
+    DIRECTX_TEX_API HRESULT __cdecl TransformImage(
         _In_ const Image& image,
         _In_ std::function<void __cdecl(_Out_writes_(width) XMVECTOR* outPixels,
             _In_reads_(width) const XMVECTOR* inPixels, size_t width, size_t y)> pixelFunc,
         ScratchImage& result);
-    HRESULT __cdecl TransformImage(
+    DIRECTX_TEX_API HRESULT __cdecl TransformImage(
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ std::function<void __cdecl(_Out_writes_(width) XMVECTOR* outPixels,
             _In_reads_(width) const XMVECTOR* inPixels, size_t width, size_t y)> pixelFunc,
@@ -919,7 +1054,7 @@ namespace DirectX
     //---------------------------------------------------------------------------------
     // WIC utility code
 #ifdef _WIN32
-    enum WICCodecs
+    enum WICCodecs : uint32_t
     {
         WIC_CODEC_BMP = 1,          // Windows Bitmap (.bmp)
         WIC_CODEC_JPEG,             // Joint Photographic Experts Group (.jpg, .jpeg)
@@ -931,19 +1066,31 @@ namespace DirectX
         WIC_CODEC_HEIF,             // High Efficiency Image File (.heif, .heic)
     };
 
-    REFGUID __cdecl GetWICCodec(_In_ WICCodecs codec) noexcept;
+    DIRECTX_TEX_API REFGUID __cdecl GetWICCodec(_In_ WICCodecs codec) noexcept;
 
-    IWICImagingFactory* __cdecl GetWICFactory(bool& iswic2) noexcept;
-    void __cdecl SetWICFactory(_In_opt_ IWICImagingFactory* pWIC) noexcept;
+    DIRECTX_TEX_API IWICImagingFactory* __cdecl GetWICFactory(bool& iswic2) noexcept;
+    DIRECTX_TEX_API void __cdecl SetWICFactory(_In_opt_ IWICImagingFactory* pWIC) noexcept;
 #endif
 
     //---------------------------------------------------------------------------------
     // DDS helper functions
-    HRESULT __cdecl EncodeDDSHeader(
+    DIRECTX_TEX_API HRESULT __cdecl EncodeDDSHeader(
         _In_ const TexMetadata& metadata, DDS_FLAGS flags,
-        _Out_writes_bytes_to_opt_(maxsize, required) void* pDestination, _In_ size_t maxsize,
+        _Out_writes_bytes_to_opt_(maxsize, required) uint8_t* pDestination, _In_ size_t maxsize,
         _Out_ size_t& required) noexcept;
 
+#ifdef __cpp_lib_byte
+    DIRECTX_TEX_API HRESULT __cdecl EncodeDDSHeader(
+        _In_ const TexMetadata& metadata, DDS_FLAGS flags,
+        _Out_writes_bytes_to_opt_(maxsize, required) std::byte* pDestination, _In_ size_t maxsize,
+        _Out_ size_t& required) noexcept;
+
+    DIRECTX_TEX_API HRESULT __cdecl EncodeDDSHeader(
+        _In_ const TexMetadata& metadata, DDS_FLAGS flags,
+        _Reserved_ std::nullptr_t, _In_ size_t maxsize,
+        _Out_ size_t& required) noexcept;
+#endif
+
     //---------------------------------------------------------------------------------
     // Direct3D interop
 
@@ -956,48 +1103,48 @@ namespace DirectX
 
     // Direct3D 11 functions
 #if defined(__d3d11_h__) || defined(__d3d11_x_h__)
-    bool __cdecl IsSupportedTexture(_In_ ID3D11Device* pDevice, _In_ const TexMetadata& metadata) noexcept;
+    DIRECTX_TEX_API bool __cdecl IsSupportedTexture(_In_ ID3D11Device* pDevice, _In_ const TexMetadata& metadata) noexcept;
 
-    HRESULT __cdecl CreateTexture(
+    DIRECTX_TEX_API HRESULT __cdecl CreateTexture(
         _In_ ID3D11Device* pDevice, _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _Outptr_ ID3D11Resource** ppResource) noexcept;
 
-    HRESULT __cdecl CreateShaderResourceView(
+    DIRECTX_TEX_API HRESULT __cdecl CreateShaderResourceView(
         _In_ ID3D11Device* pDevice, _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _Outptr_ ID3D11ShaderResourceView** ppSRV) noexcept;
 
-    HRESULT __cdecl CreateTextureEx(
+    DIRECTX_TEX_API HRESULT __cdecl CreateTextureEx(
         _In_ ID3D11Device* pDevice, _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ D3D11_USAGE usage, _In_ unsigned int bindFlags, _In_ unsigned int cpuAccessFlags, _In_ unsigned int miscFlags, _In_ CREATETEX_FLAGS flags,
         _Outptr_ ID3D11Resource** ppResource) noexcept;
 
-    HRESULT __cdecl CreateShaderResourceViewEx(
+    DIRECTX_TEX_API HRESULT __cdecl CreateShaderResourceViewEx(
         _In_ ID3D11Device* pDevice, _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         _In_ D3D11_USAGE usage, _In_ unsigned int bindFlags, _In_ unsigned int cpuAccessFlags, _In_ unsigned int miscFlags, _In_ CREATETEX_FLAGS flags,
         _Outptr_ ID3D11ShaderResourceView** ppSRV) noexcept;
 
-    HRESULT __cdecl CaptureTexture(_In_ ID3D11Device* pDevice, _In_ ID3D11DeviceContext* pContext, _In_ ID3D11Resource* pSource, _Out_ ScratchImage& result) noexcept;
+    DIRECTX_TEX_API HRESULT __cdecl CaptureTexture(_In_ ID3D11Device* pDevice, _In_ ID3D11DeviceContext* pContext, _In_ ID3D11Resource* pSource, _Out_ ScratchImage& result) noexcept;
 #endif
 
     // Direct3D 12 functions
 #if defined(__d3d12_h__) || defined(__d3d12_x_h__) || defined(__XBOX_D3D12_X__)
-    bool __cdecl IsSupportedTexture(_In_ ID3D12Device* pDevice, _In_ const TexMetadata& metadata) noexcept;
+    DIRECTX_TEX_API bool __cdecl IsSupportedTexture(_In_ ID3D12Device* pDevice, _In_ const TexMetadata& metadata) noexcept;
 
-    HRESULT __cdecl CreateTexture(
+    DIRECTX_TEX_API HRESULT __cdecl CreateTexture(
         _In_ ID3D12Device* pDevice, _In_ const TexMetadata& metadata,
         _Outptr_ ID3D12Resource** ppResource) noexcept;
 
-    HRESULT __cdecl CreateTextureEx(
+    DIRECTX_TEX_API HRESULT __cdecl CreateTextureEx(
         _In_ ID3D12Device* pDevice, _In_ const TexMetadata& metadata,
         _In_ D3D12_RESOURCE_FLAGS resFlags, _In_ CREATETEX_FLAGS flags,
         _Outptr_ ID3D12Resource** ppResource) noexcept;
 
-    HRESULT __cdecl PrepareUpload(
+    DIRECTX_TEX_API HRESULT __cdecl PrepareUpload(
         _In_ ID3D12Device* pDevice,
         _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
         std::vector<D3D12_SUBRESOURCE_DATA>& subresources);
 
-    HRESULT __cdecl CaptureTexture(
+    DIRECTX_TEX_API HRESULT __cdecl CaptureTexture(
         _In_ ID3D12CommandQueue* pCommandQueue, _In_ ID3D12Resource* pSource, _In_ bool isCubeMap,
         _Out_ ScratchImage& result,
         _In_ D3D12_RESOURCE_STATES beforeState = D3D12_RESOURCE_STATE_RENDER_TARGET,

DirectXTex/DirectXTex.inl

@@ -14,6 +14,12 @@
 //=====================================================================================
 // Bitmask flags enumerator operators
 //=====================================================================================
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
+#pragma clang diagnostic ignored "-Wextra-semi-stmt"
+#endif
+
 DEFINE_ENUM_FLAG_OPERATORS(CP_FLAGS);
 DEFINE_ENUM_FLAG_OPERATORS(DDS_FLAGS);
 DEFINE_ENUM_FLAG_OPERATORS(TGA_FLAGS);
@@ -26,17 +32,21 @@ DEFINE_ENUM_FLAG_OPERATORS(CNMAP_FLAGS);
 DEFINE_ENUM_FLAG_OPERATORS(CMSE_FLAGS);
 DEFINE_ENUM_FLAG_OPERATORS(CREATETEX_FLAGS);
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 // WIC_FILTER modes match TEX_FILTER modes
-constexpr WIC_FLAGS operator|(WIC_FLAGS a, TEX_FILTER_FLAGS b) { return static_cast<WIC_FLAGS>(static_cast<unsigned long>(a) | static_cast<unsigned long>(b & TEX_FILTER_MODE_MASK)); }
-constexpr WIC_FLAGS operator|(TEX_FILTER_FLAGS a, WIC_FLAGS b) { return static_cast<WIC_FLAGS>(static_cast<unsigned long>(a & TEX_FILTER_MODE_MASK) | static_cast<unsigned long>(b)); }
+constexpr WIC_FLAGS operator|(WIC_FLAGS a, TEX_FILTER_FLAGS b) { return static_cast<WIC_FLAGS>(static_cast<uint32_t>(a) | static_cast<uint32_t>(b & TEX_FILTER_MODE_MASK)); }
+constexpr WIC_FLAGS operator|(TEX_FILTER_FLAGS a, WIC_FLAGS b) { return static_cast<WIC_FLAGS>(static_cast<uint32_t>(a & TEX_FILTER_MODE_MASK) | static_cast<uint32_t>(b)); }
 
 // TEX_PMALPHA_SRGB match TEX_FILTER_SRGB
-constexpr TEX_PMALPHA_FLAGS operator|(TEX_PMALPHA_FLAGS a, TEX_FILTER_FLAGS b) { return static_cast<TEX_PMALPHA_FLAGS>(static_cast<unsigned long>(a) | static_cast<unsigned long>(b & TEX_FILTER_SRGB_MASK)); }
-constexpr TEX_PMALPHA_FLAGS operator|(TEX_FILTER_FLAGS a, TEX_PMALPHA_FLAGS b) { return static_cast<TEX_PMALPHA_FLAGS>(static_cast<unsigned long>(a & TEX_FILTER_SRGB_MASK) | static_cast<unsigned long>(b)); }
+constexpr TEX_PMALPHA_FLAGS operator|(TEX_PMALPHA_FLAGS a, TEX_FILTER_FLAGS b) { return static_cast<TEX_PMALPHA_FLAGS>(static_cast<uint32_t>(a) | static_cast<uint32_t>(b & TEX_FILTER_SRGB_MASK)); }
+constexpr TEX_PMALPHA_FLAGS operator|(TEX_FILTER_FLAGS a, TEX_PMALPHA_FLAGS b) { return static_cast<TEX_PMALPHA_FLAGS>(static_cast<uint32_t>(a & TEX_FILTER_SRGB_MASK) | static_cast<uint32_t>(b)); }
 
 // TEX_COMPRESS_SRGB match TEX_FILTER_SRGB
-constexpr TEX_COMPRESS_FLAGS operator|(TEX_COMPRESS_FLAGS a, TEX_FILTER_FLAGS b) { return static_cast<TEX_COMPRESS_FLAGS>(static_cast<unsigned long>(a) | static_cast<unsigned long>(b & TEX_FILTER_SRGB_MASK)); }
-constexpr TEX_COMPRESS_FLAGS operator|(TEX_FILTER_FLAGS a, TEX_COMPRESS_FLAGS b) { return static_cast<TEX_COMPRESS_FLAGS>(static_cast<unsigned long>(a & TEX_FILTER_SRGB_MASK) | static_cast<unsigned long>(b)); }
+constexpr TEX_COMPRESS_FLAGS operator|(TEX_COMPRESS_FLAGS a, TEX_FILTER_FLAGS b) { return static_cast<TEX_COMPRESS_FLAGS>(static_cast<uint32_t>(a) | static_cast<uint32_t>(b & TEX_FILTER_SRGB_MASK)); }
+constexpr TEX_COMPRESS_FLAGS operator|(TEX_FILTER_FLAGS a, TEX_COMPRESS_FLAGS b) { return static_cast<TEX_COMPRESS_FLAGS>(static_cast<uint32_t>(a & TEX_FILTER_SRGB_MASK) | static_cast<uint32_t>(b)); }
 
 
 //=====================================================================================
@@ -156,7 +166,7 @@ inline HRESULT __cdecl SaveToDDSFile(const Image& image, DDS_FLAGS flags, const
 // Compatability helpers
 //=====================================================================================
 _Use_decl_annotations_
-inline HRESULT __cdecl GetMetadataFromTGAMemory(const void* pSource, size_t size, TexMetadata& metadata) noexcept
+inline HRESULT __cdecl GetMetadataFromTGAMemory(const uint8_t* pSource, size_t size, TexMetadata& metadata) noexcept
 {
     return GetMetadataFromTGAMemory(pSource, size, TGA_FLAGS_NONE, metadata);
 }
@@ -168,7 +178,7 @@ inline HRESULT __cdecl GetMetadataFromTGAFile(const wchar_t* szFile, TexMetadata
 }
 
 _Use_decl_annotations_
-inline HRESULT __cdecl LoadFromTGAMemory(const void* pSource, size_t size, TexMetadata* metadata, ScratchImage& image) noexcept
+inline HRESULT __cdecl LoadFromTGAMemory(const uint8_t* pSource, size_t size, TexMetadata* metadata, ScratchImage& image) noexcept
 {
     return LoadFromTGAMemory(pSource, size, TGA_FLAGS_NONE, metadata, image);
 }
@@ -190,3 +200,85 @@ inline HRESULT __cdecl SaveToTGAFile(const Image& image, const wchar_t* szFile,
 {
     return SaveToTGAFile(image, TGA_FLAGS_NONE, szFile, metadata);
 }
+
+
+//=====================================================================================
+// C++17 helpers
+//=====================================================================================
+#ifdef __cpp_lib_byte
+
+_Use_decl_annotations_
+inline HRESULT __cdecl GetMetadataFromDDSMemory(const std::byte* pSource, size_t size, DDS_FLAGS flags, TexMetadata& metadata) noexcept
+{
+    return GetMetadataFromDDSMemory(reinterpret_cast<const uint8_t*>(pSource), size, flags, metadata);
+}
+
+_Use_decl_annotations_
+inline HRESULT __cdecl LoadFromDDSMemory(const std::byte* pSource, size_t size, DDS_FLAGS flags, TexMetadata* metadata, ScratchImage& image) noexcept
+{
+    return LoadFromDDSMemory(reinterpret_cast<const uint8_t*>(pSource), size, flags, metadata, image);
+}
+
+_Use_decl_annotations_
+inline HRESULT __cdecl GetMetadataFromDDSMemoryEx(const std::byte* pSource, size_t size, DDS_FLAGS flags, TexMetadata& metadata, DDSMetaData* ddPixelFormat) noexcept
+{
+    return GetMetadataFromDDSMemoryEx(reinterpret_cast<const uint8_t*>(pSource), size, flags, metadata, ddPixelFormat);
+}
+
+_Use_decl_annotations_
+inline HRESULT __cdecl LoadFromDDSMemoryEx(const std::byte* pSource, size_t size, DDS_FLAGS flags, TexMetadata* metadata, DDSMetaData* ddPixelFormat, ScratchImage& image) noexcept
+{
+    return LoadFromDDSMemoryEx(reinterpret_cast<const uint8_t*>(pSource), size, flags, metadata, ddPixelFormat, image);
+}
+
+_Use_decl_annotations_
+inline HRESULT __cdecl GetMetadataFromHDRMemory(const std::byte* pSource, size_t size, TexMetadata& metadata) noexcept
+{
+    return GetMetadataFromHDRMemory(reinterpret_cast<const uint8_t*>(pSource), size, metadata);
+}
+
+_Use_decl_annotations_
+inline HRESULT __cdecl LoadFromHDRMemory(const std::byte* pSource, size_t size, TexMetadata* metadata, ScratchImage& image) noexcept
+{
+    return LoadFromHDRMemory(reinterpret_cast<const uint8_t*>(pSource), size, metadata, image);
+}
+
+_Use_decl_annotations_
+inline HRESULT __cdecl GetMetadataFromTGAMemory(const std::byte* pSource, size_t size, TGA_FLAGS flags, TexMetadata& metadata) noexcept
+{
+    return GetMetadataFromTGAMemory(reinterpret_cast<const uint8_t*>(pSource), size, flags, metadata);
+}
+
+_Use_decl_annotations_
+inline HRESULT __cdecl LoadFromTGAMemory(const std::byte* pSource, size_t size, TGA_FLAGS flags, TexMetadata* metadata, ScratchImage& image) noexcept
+{
+    return LoadFromTGAMemory(reinterpret_cast<const uint8_t*>(pSource), size, flags, metadata, image);
+}
+
+_Use_decl_annotations_
+inline HRESULT __cdecl EncodeDDSHeader(const TexMetadata& metadata, DDS_FLAGS flags, std::byte* pDestination, size_t maxsize, size_t& required) noexcept
+{
+    return EncodeDDSHeader(metadata, flags, reinterpret_cast<uint8_t*>(pDestination), maxsize, required);
+}
+
+_Use_decl_annotations_
+inline HRESULT __cdecl EncodeDDSHeader(const TexMetadata& metadata, DDS_FLAGS flags, std::nullptr_t, size_t maxsize, size_t& required) noexcept
+{
+    return EncodeDDSHeader(metadata, flags, static_cast<uint8_t*>(nullptr), maxsize, required);
+}
+
+#ifdef _WIN32
+_Use_decl_annotations_
+inline HRESULT __cdecl GetMetadataFromWICMemory(const std::byte* pSource, size_t size, WIC_FLAGS flags, TexMetadata& metadata, std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR)
+{
+    return GetMetadataFromWICMemory(reinterpret_cast<const uint8_t*>(pSource), size, flags, metadata, getMQR);
+}
+
+_Use_decl_annotations_
+inline HRESULT __cdecl LoadFromWICMemory(const std::byte* pSource, size_t size, WIC_FLAGS flags, TexMetadata* metadata, ScratchImage& image, std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR)
+{
+    return LoadFromWICMemory(reinterpret_cast<const uint8_t*>(pSource), size, flags, metadata, image, getMQR);
+}
+#endif // _WIN32
+
+#endif // __cpp_lib_byte

DirectXTex/DirectXTexCompress.cpp

@@ -254,10 +254,10 @@ namespace
 
         const size_t progressTotal = std::max<size_t>(1, (image.height + 3) / 4);
 
-#pragma omp parallel for shared(progress)
+    #pragma omp parallel for shared(progress)
         for (int nb = 0; nb < static_cast<int>(nBlocks); ++nb)
         {
-#pragma omp flush (abort)
+        #pragma omp flush (abort)
             if (abort)
             {
                 // Short circuit the loop body if an abort is requested.
@@ -350,13 +350,13 @@ namespace
             // Report progress when a new row is reached.
             if (x == 0 && statusCallback)
             {
-#pragma omp atomic
+            #pragma omp atomic
                 progress += 4;
 
                 if (!statusCallback(progress, progressTotal))
                 {
                     abort = true;
-#pragma omp flush (abort)
+                #pragma omp flush (abort)
                 }
             }
         }

DirectXTex/DirectXTexCompressGPU.cpp

@@ -172,7 +172,7 @@ namespace
             ScratchImage image;
             HRESULT hr = E_UNEXPECTED;
 
-            auto const srgb = GetSRGBFlags(compress);
+            const auto srgb = GetSRGBFlags(compress);
 
             switch (tformat)
             {
@@ -261,6 +261,9 @@ HRESULT DirectX::CompressEx(
         || IsTypeless(srcImage.format) || IsPlanar(srcImage.format) || IsPalettized(srcImage.format))
         return HRESULT_E_NOT_SUPPORTED;
 
+    if (!srcImage.pixels)
+        return E_POINTER;
+
     // Setup GPU compressor
     std::unique_ptr<GPUCompressBC> gpubc(new (std::nothrow) GPUCompressBC);
     if (!gpubc)

DirectXTex/DirectXTexConvert.cpp

@@ -415,6 +415,9 @@ void DirectX::Internal::CopyScanline(
         case DXGI_FORMAT_A8_UNORM:
             memset(pDestination, 0xff, outSize);
             return;
+
+        default:
+            break;
         }
     }
 
@@ -586,6 +589,9 @@ void DirectX::Internal::SwizzleScanline(
             }
         }
         break;
+
+    default:
+        break;
     }
 
     // Fall-through case is to just use memcpy (assuming this is not an in-place operation)
@@ -977,8 +983,8 @@ _Use_decl_annotations_ bool DirectX::Internal::LoadScanline(
             auto sPtr = static_cast<const uint32_t*>(pSource);
             for (size_t icount = 0; icount < (size - sizeof(uint32_t) + 1); icount += sizeof(uint32_t))
             {
-                auto const d = static_cast<float>(*sPtr & 0xFFFFFF) / 16777215.f;
-                auto const s = static_cast<float>((*sPtr & 0xFF000000) >> 24);
+                const auto d = static_cast<float>(*sPtr & 0xFFFFFF) / 16777215.f;
+                const auto s = static_cast<float>((*sPtr & 0xFF000000) >> 24);
                 ++sPtr;
                 if (dPtr >= ePtr) break;
                 *(dPtr++) = XMVectorSet(d, s, 0.f, 1.f);
@@ -993,7 +999,7 @@ _Use_decl_annotations_ bool DirectX::Internal::LoadScanline(
             auto sPtr = static_cast<const uint32_t*>(pSource);
             for (size_t icount = 0; icount < (size - sizeof(uint32_t) + 1); icount += sizeof(uint32_t))
             {
-                auto const r = static_cast<float>(*sPtr & 0xFFFFFF) / 16777215.f;
+                const auto r = static_cast<float>(*sPtr & 0xFFFFFF) / 16777215.f;
                 ++sPtr;
                 if (dPtr >= ePtr) break;
                 *(dPtr++) = XMVectorSet(r, 0.f /* typeless component assumed zero */, 0.f, 1.f);
@@ -1008,7 +1014,7 @@ _Use_decl_annotations_ bool DirectX::Internal::LoadScanline(
             auto sPtr = static_cast<const uint32_t*>(pSource);
             for (size_t icount = 0; icount < (size - sizeof(uint32_t) + 1); icount += sizeof(uint32_t))
             {
-                auto const g = static_cast<float>((*sPtr & 0xFF000000) >> 24);
+                const auto g = static_cast<float>((*sPtr & 0xFF000000) >> 24);
                 ++sPtr;
                 if (dPtr >= ePtr) break;
                 *(dPtr++) = XMVectorSet(0.f /* typeless component assumed zero */, g, 0.f, 1.f);
@@ -1338,9 +1344,9 @@ _Use_decl_annotations_ bool DirectX::Internal::LoadScanline(
                 // G = 1.1678Y' - 0.3929Cb' - 0.8152Cr'
                 // B = 1.1678Y' + 2.0232Cb'
 
-                auto const r = static_cast<int>((76533 * y + 104905 * v + 32768) >> 16);
-                auto const g = static_cast<int>((76533 * y - 25747 * u - 53425 * v + 32768) >> 16);
-                auto const b = static_cast<int>((76533 * y + 132590 * u + 32768) >> 16);
+                const auto r = static_cast<int>((76533 * y + 104905 * v + 32768) >> 16);
+                const auto g = static_cast<int>((76533 * y - 25747 * u - 53425 * v + 32768) >> 16);
+                const auto b = static_cast<int>((76533 * y + 132590 * u + 32768) >> 16);
 
                 if (dPtr >= ePtr) break;
                 *(dPtr++) = XMVectorSet(float(std::min<int>(std::max<int>(r, 0), 1023)) / 1023.f,
@@ -1361,7 +1367,7 @@ _Use_decl_annotations_ bool DirectX::Internal::LoadScanline(
                 const int64_t u = int64_t(sPtr->x) - 32768;
                 const int64_t y = int64_t(sPtr->y) - 4096;
                 const int64_t v = int64_t(sPtr->z) - 32768;
-                auto const a = static_cast<int>(sPtr->w);
+                const auto a = static_cast<int>(sPtr->w);
                 ++sPtr;
 
                 // http://msdn.microsoft.com/en-us/library/windows/desktop/bb970578.aspx
@@ -1374,9 +1380,9 @@ _Use_decl_annotations_ bool DirectX::Internal::LoadScanline(
                 // G = 1.1689Y' - 0.3933Cb' - 0.8160Cr'
                 // B = 1.1689Y'+ 2.0251Cb'
 
-                auto const r = static_cast<int>((76607 * y + 105006 * v + 32768) >> 16);
-                auto const g = static_cast<int>((76607 * y - 25772 * u - 53477 * v + 32768) >> 16);
-                auto const b = static_cast<int>((76607 * y + 132718 * u + 32768) >> 16);
+                const auto r = static_cast<int>((76607 * y + 105006 * v + 32768) >> 16);
+                const auto g = static_cast<int>((76607 * y - 25772 * u - 53477 * v + 32768) >> 16);
+                const auto b = static_cast<int>((76607 * y + 132718 * u + 32768) >> 16);
 
                 if (dPtr >= ePtr) break;
                 *(dPtr++) = XMVectorSet(float(std::min<int>(std::max<int>(r, 0), 65535)) / 65535.f,
@@ -2094,11 +2100,11 @@ bool DirectX::Internal::StoreScanline(
             {
                 if (sPtr >= ePtr) break;
                 XMVECTOR v = XMVectorSwizzle<2, 1, 0, 3>(*sPtr++);
-#if defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || __arm__ || __aarch64__
+            #if defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || __arm__ || __aarch64__
                 v = XMVectorMultiplyAdd(v, s_Scale, g_XMOneHalf);
-#else
+            #else
                 v = XMVectorMultiply(v, s_Scale);
-#endif
+            #endif
                 XMStoreU565(dPtr++, v);
             }
             return true;
@@ -2109,19 +2115,19 @@ bool DirectX::Internal::StoreScanline(
         if (size >= sizeof(XMU555))
         {
             static const XMVECTORF32 s_Scale = { { { 31.f, 31.f, 31.f, 1.f } } };
-#if defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || __arm__ || __aarch64__
+        #if defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || __arm__ || __aarch64__
             static const XMVECTORF32 s_OneHalfXYZ = { { { 0.5f, 0.5f, 0.5f, 0.f } } };
-#endif
+        #endif
             XMU555 * __restrict dPtr = static_cast<XMU555*>(pDestination);
             for (size_t icount = 0; icount < (size - sizeof(XMU555) + 1); icount += sizeof(XMU555))
             {
                 if (sPtr >= ePtr) break;
                 XMVECTOR v = XMVectorSwizzle<2, 1, 0, 3>(*sPtr++);
-#if defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || __arm__ || __aarch64__
+            #if defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || __arm__ || __aarch64__
                 v = XMVectorMultiplyAdd(v, s_Scale, s_OneHalfXYZ);
-#else
+            #else
                 v = XMVectorMultiply(v, s_Scale);
-#endif
+            #endif
                 XMStoreU555(dPtr, v);
                 dPtr->w = (XMVectorGetW(v) > threshold) ? 1u : 0u;
                 ++dPtr;
@@ -2397,11 +2403,11 @@ bool DirectX::Internal::StoreScanline(
             {
                 if (sPtr >= ePtr) break;
                 XMVECTOR v = XMVectorSwizzle<2, 1, 0, 3>(*sPtr++);
-#if defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || __arm__ || __aarch64__
+            #if defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || __arm__ || __aarch64__
                 v = XMVectorMultiplyAdd(v, s_Scale, g_XMOneHalf);
-#else
+            #else
                 v = XMVectorMultiply(v, s_Scale);
-#endif
+            #endif
                 XMStoreUNibble4(dPtr++, v);
             }
             return true;
@@ -2417,11 +2423,11 @@ bool DirectX::Internal::StoreScanline(
             {
                 if (sPtr >= ePtr) break;
                 XMVECTOR v = XMVectorSwizzle<3, 2, 1, 0>(*sPtr++);
-#if defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || __arm__ || __aarch64__
+            #if defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || __arm__ || __aarch64__
                 v = XMVectorMultiplyAdd(v, s_Scale, g_XMOneHalf);
-#else
+            #else
                 v = XMVectorMultiply(v, s_Scale);
-#endif
+            #endif
                 XMStoreUNibble4(dPtr++, v);
             }
             return true;
@@ -2497,11 +2503,11 @@ bool DirectX::Internal::StoreScanline(
             for (size_t icount = 0; icount < (size - sizeof(uint8_t) + 1); icount += sizeof(uint8_t))
             {
                 if (sPtr >= ePtr) break;
-#if defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || __arm__ || __aarch64__
+            #if defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || __arm__ || __aarch64__
                 const XMVECTOR v = XMVectorMultiplyAdd(*sPtr++, s_Scale, g_XMOneHalf);
-#else
+            #else
                 const XMVECTOR v = XMVectorMultiply(*sPtr++, s_Scale);
-#endif
+            #endif
                 XMUNIBBLE4 nibble;
                 XMStoreUNibble4(&nibble, v);
                 *dPtr = static_cast<uint8_t>(nibble.v);
@@ -4710,7 +4716,7 @@ namespace
             filter &= ~(TEX_FILTER_SRGB_IN | TEX_FILTER_SRGB_OUT);
         }
 
-        auto const wicsrgb = CheckWICColorSpace(pfGUID, targetGUID);
+        const auto wicsrgb = CheckWICColorSpace(pfGUID, targetGUID);
 
         if (wicsrgb != (filter & (TEX_FILTER_SRGB_IN | TEX_FILTER_SRGB_OUT)))
         {
@@ -4937,7 +4943,7 @@ namespace
         {\
             const size_t rowPitch = srcImage.rowPitch;\
             \
-            auto const sourceE = reinterpret_cast<const srcType*>(pSrc + srcImage.slicePitch);\
+            const auto sourceE = reinterpret_cast<const srcType*>(pSrc + srcImage.slicePitch);\
             auto pSrcUV = pSrc + (srcImage.height * rowPitch);\
             \
             for(size_t y = 0; y < srcImage.height; y+= 2)\

DirectXTex/DirectXTexD3D11.cpp

@@ -653,6 +653,9 @@ HRESULT DirectX::CreateTextureEx(
             hr = pDevice->CreateTexture3D(&desc, initData.get(), reinterpret_cast<ID3D11Texture3D**>(ppResource));
         }
         break;
+
+    default:
+        return HRESULT_E_NOT_SUPPORTED;
     }
 
     return hr;

DirectXTex/DirectXTexD3D12.cpp

@@ -88,6 +88,9 @@ namespace
                 res.SlicePitch = res.RowPitch * static_cast<PT>(height);
             }
             break;
+
+        default:
+            break;
         }
     }
 
@@ -214,8 +217,11 @@ namespace
         bufferDesc.SampleDesc.Count = 1;
 
         ComPtr<ID3D12Resource> copySource(pSource);
+        D3D12_RESOURCE_STATES beforeStateSource = beforeState;
         if (desc.SampleDesc.Count > 1)
         {
+            TransitionResource(commandList.Get(), pSource, beforeState, D3D12_RESOURCE_STATE_RESOLVE_SOURCE);
+
             // MSAA content must be resolved before being copied to a staging texture
             auto descCopy = desc;
             descCopy.SampleDesc.Count = 1;
@@ -227,7 +233,7 @@ namespace
                 &defaultHeapProperties,
                 D3D12_HEAP_FLAG_NONE,
                 &descCopy,
-                D3D12_RESOURCE_STATE_COPY_DEST,
+                D3D12_RESOURCE_STATE_RESOLVE_DEST,
                 nullptr,
                 IID_GRAPHICS_PPV_ARGS(pTemp.GetAddressOf()));
             if (FAILED(hr))
@@ -264,6 +270,11 @@ namespace
             }
 
             copySource = pTemp;
+            beforeState = D3D12_RESOURCE_STATE_RESOLVE_DEST;
+        }
+        else
+        {
+            beforeStateSource = D3D12_RESOURCE_STATE_COPY_SOURCE;
         }
 
         // Create a staging texture
@@ -280,7 +291,7 @@ namespace
         assert(*pStaging);
 
         // Transition the resource if necessary
-        TransitionResource(commandList.Get(), pSource, beforeState, D3D12_RESOURCE_STATE_COPY_SOURCE);
+        TransitionResource(commandList.Get(), copySource.Get(), beforeState, D3D12_RESOURCE_STATE_COPY_SOURCE);
 
         // Get the copy target location
         for (UINT j = 0; j < numberOfResources; ++j)
@@ -290,8 +301,8 @@ namespace
             commandList->CopyTextureRegion(&copyDest, 0, 0, 0, &copySrc, nullptr);
         }
 
-        // Transition the resource to the next state
-        TransitionResource(commandList.Get(), pSource, D3D12_RESOURCE_STATE_COPY_SOURCE, afterState);
+        // Transition the source resource to the next state
+        TransitionResource(commandList.Get(), pSource, beforeStateSource, afterState);
 
         hr = commandList->Close();
         if (FAILED(hr))
@@ -727,10 +738,10 @@ HRESULT DirectX::CaptureTexture(
     pCommandQueue->GetDevice(IID_GRAPHICS_PPV_ARGS(device.GetAddressOf()));
 
 #if defined(_MSC_VER) || !defined(_WIN32)
-    auto const desc = pSource->GetDesc();
+    const auto desc = pSource->GetDesc();
 #else
     D3D12_RESOURCE_DESC tmpDesc;
-    auto const& desc = *pSource->GetDesc(&tmpDesc);
+    const auto& desc = *pSource->GetDesc(&tmpDesc);
 #endif
 
     ComPtr<ID3D12Resource> pStaging;

DirectXTex/DirectXTexDDS.cpp

@@ -22,8 +22,6 @@ static_assert(static_cast<int>(TEX_DIMENSION_TEXTURE3D) == static_cast<int>(DDS_
 
 namespace
 {
-    constexpr size_t MAX_HEADER_SIZE = sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10);
-
     //-------------------------------------------------------------------------------------
     // Legacy format mapping table (used for DDS files without 'DX10' extended header)
     //-------------------------------------------------------------------------------------
@@ -48,6 +46,9 @@ namespace
         CONV_FLAGS_L8 = 0x40000,        // Source is a 8 luminance format
         CONV_FLAGS_L16 = 0x80000,       // Source is a 16 luminance format
         CONV_FLAGS_A8L8 = 0x100000,     // Source is a 8:8 luminance format
+        CONV_FLAGS_L6V5U5 = 0x200000,   // Source is a 6:5:5 bumpluminance format
+        CONV_FLAGS_L8U8V8 = 0x400000,   // Source is a X:8:8:8 bumpluminance format
+        CONV_FLAGS_WUV10 = 0x800000,    // Source is a 2:10:10:10 bump format
     };
 
     struct LegacyDDS
@@ -104,19 +105,18 @@ namespace
         { DXGI_FORMAT_R10G10B10A2_UNORM,  CONV_FLAGS_SWIZZLE,   DDSPF_A2R10G10B10 }, // D3DFMT_A2R10G10B10 (D3DX reversal issue)
         { DXGI_FORMAT_R10G10B10A2_UNORM,  CONV_FLAGS_NONE,      DDSPF_A2B10G10R10 }, // D3DFMT_A2B10G10R10 (D3DX reversal issue)
 
-        { DXGI_FORMAT_R8G8B8A8_UNORM,     CONV_FLAGS_EXPAND
-                                          | CONV_FLAGS_NOALPHA
-                                          | CONV_FLAGS_888,       DDSPF_R8G8B8 }, // D3DFMT_R8G8B8
+        { DXGI_FORMAT_R8G8B8A8_UNORM,     CONV_FLAGS_EXPAND | CONV_FLAGS_NOALPHA | CONV_FLAGS_888,
+                                                                DDSPF_R8G8B8 }, // D3DFMT_R8G8B8
 
         { DXGI_FORMAT_B5G6R5_UNORM,       CONV_FLAGS_565,       DDSPF_R5G6B5 }, // D3DFMT_R5G6B5
         { DXGI_FORMAT_B5G5R5A1_UNORM,     CONV_FLAGS_5551,      DDSPF_A1R5G5B5 }, // D3DFMT_A1R5G5B5
-        { DXGI_FORMAT_B5G5R5A1_UNORM,     CONV_FLAGS_5551
-                                          | CONV_FLAGS_NOALPHA,   DDSPF_X1R5G5B5 }, // D3DFMT_X1R5G5B5
+        { DXGI_FORMAT_B5G5R5A1_UNORM,     CONV_FLAGS_5551 | CONV_FLAGS_NOALPHA,
+                                                                DDSPF_X1R5G5B5 }, // D3DFMT_X1R5G5B5
 
-        { DXGI_FORMAT_R8G8B8A8_UNORM,     CONV_FLAGS_EXPAND
-                                          | CONV_FLAGS_8332,      DDSPF_A8R3G3B2 }, // D3DFMT_A8R3G3B2
-        { DXGI_FORMAT_B5G6R5_UNORM,       CONV_FLAGS_EXPAND
-                                          | CONV_FLAGS_332,       DDSPF_R3G3B2 }, // D3DFMT_R3G3B2
+        { DXGI_FORMAT_R8G8B8A8_UNORM,     CONV_FLAGS_EXPAND | CONV_FLAGS_8332,
+                                                                DDSPF_A8R3G3B2 }, // D3DFMT_A8R3G3B2
+        { DXGI_FORMAT_B5G6R5_UNORM,       CONV_FLAGS_EXPAND | CONV_FLAGS_332,
+                                                                DDSPF_R3G3B2 }, // D3DFMT_R3G3B2
 
         { DXGI_FORMAT_R8_UNORM,           CONV_FLAGS_NONE,      DDSPF_L8 }, // D3DFMT_L8
         { DXGI_FORMAT_R16_UNORM,          CONV_FLAGS_NONE,      DDSPF_L16 }, // D3DFMT_L16
@@ -141,17 +141,16 @@ namespace
 
         { DXGI_FORMAT_R32_FLOAT,          CONV_FLAGS_NONE,      { sizeof(DDS_PIXELFORMAT), DDS_RGB,       0, 32, 0xffffffff, 0, 0, 0 } }, // D3DFMT_R32F (D3DX uses FourCC 114 instead)
 
-        { DXGI_FORMAT_R8G8B8A8_UNORM,     CONV_FLAGS_EXPAND
-                                          | CONV_FLAGS_PAL8
-                                          | CONV_FLAGS_A8P8,      { sizeof(DDS_PIXELFORMAT), DDS_PAL8A,     0, 16, 0, 0, 0, 0 } }, // D3DFMT_A8P8
-        { DXGI_FORMAT_R8G8B8A8_UNORM,     CONV_FLAGS_EXPAND
-                                          | CONV_FLAGS_PAL8,      { sizeof(DDS_PIXELFORMAT), DDS_PAL8,      0,  8, 0, 0, 0, 0 } }, // D3DFMT_P8
+        { DXGI_FORMAT_R8G8B8A8_UNORM,     CONV_FLAGS_EXPAND | CONV_FLAGS_PAL8 | CONV_FLAGS_A8P8,
+                                                                { sizeof(DDS_PIXELFORMAT), DDS_PAL8A,     0, 16, 0, 0, 0, 0xff00 } }, // D3DFMT_A8P8
+        { DXGI_FORMAT_R8G8B8A8_UNORM,     CONV_FLAGS_EXPAND | CONV_FLAGS_PAL8,
+                                                                { sizeof(DDS_PIXELFORMAT), DDS_PAL8,      0,  8, 0, 0, 0, 0 } }, // D3DFMT_P8
 
         { DXGI_FORMAT_B4G4R4A4_UNORM,     CONV_FLAGS_4444,      DDSPF_A4R4G4B4 }, // D3DFMT_A4R4G4B4 (uses DXGI 1.2 format)
-        { DXGI_FORMAT_B4G4R4A4_UNORM,     CONV_FLAGS_NOALPHA
-                                          | CONV_FLAGS_4444,      DDSPF_X4R4G4B4 }, // D3DFMT_X4R4G4B4 (uses DXGI 1.2 format)
-        { DXGI_FORMAT_B4G4R4A4_UNORM,     CONV_FLAGS_EXPAND
-                                          | CONV_FLAGS_44,        DDSPF_A4L4 }, // D3DFMT_A4L4 (uses DXGI 1.2 format)
+        { DXGI_FORMAT_B4G4R4A4_UNORM,     CONV_FLAGS_NOALPHA | CONV_FLAGS_4444,
+                                                                DDSPF_X4R4G4B4 }, // D3DFMT_X4R4G4B4 (uses DXGI 1.2 format)
+        { DXGI_FORMAT_B4G4R4A4_UNORM,     CONV_FLAGS_EXPAND | CONV_FLAGS_44,
+                                                                DDSPF_A4L4 }, // D3DFMT_A4L4 (uses DXGI 1.2 format)
 
         { DXGI_FORMAT_YUY2,               CONV_FLAGS_NONE,      DDSPF_YUY2 }, // D3DFMT_YUY2 (uses DXGI 1.2 format)
         { DXGI_FORMAT_YUY2,               CONV_FLAGS_SWIZZLE,   DDSPF_UYVY }, // D3DFMT_UYVY (uses DXGI 1.2 format)
@@ -159,6 +158,11 @@ namespace
         { DXGI_FORMAT_R8G8_SNORM,         CONV_FLAGS_NONE,      DDSPF_V8U8 },     // D3DFMT_V8U8
         { DXGI_FORMAT_R8G8B8A8_SNORM,     CONV_FLAGS_NONE,      DDSPF_Q8W8V8U8 }, // D3DFMT_Q8W8V8U8
         { DXGI_FORMAT_R16G16_SNORM,       CONV_FLAGS_NONE,      DDSPF_V16U16 },   // D3DFMT_V16U16
+
+        { DXGI_FORMAT_R8G8B8A8_UNORM,     CONV_FLAGS_L6V5U5 | CONV_FLAGS_EXPAND,
+                                                                DDSPF_L6V5U5 },      // D3DFMT_L6V5U5
+        { DXGI_FORMAT_R8G8B8A8_UNORM,     CONV_FLAGS_L8U8V8,    DDSPF_X8L8V8U8 },    // D3DFMT_X8L8V8U8
+        { DXGI_FORMAT_R10G10B10A2_UNORM,  CONV_FLAGS_WUV10,     DDSPF_A2W10V10U10 }, // D3DFMT_A2W10V10U10
     };
 
     // Note that many common DDS reader/writers (including D3DX) swap the
@@ -168,15 +172,14 @@ namespace
     // header extension and specify the DXGI_FORMAT_R10G10B10A2_UNORM format directly
 
     // We do not support the following legacy Direct3D 9 formats:
-    //      BumpDuDv D3DFMT_A2W10V10U10
-    //      BumpLuminance D3DFMT_L6V5U5, D3DFMT_X8L8V8U8
-    //      FourCC 117 D3DFMT_CxV8U8
-    //      ZBuffer D3DFMT_D16_LOCKABLE
+    //      D3DFMT_D16_LOCKABLE (DDPF_ZBUFFER: 0x00000400)
     //      FourCC 82 D3DFMT_D32F_LOCKABLE
+    //      FourCC 117 D3DFMT_CxV8U8
 
     // We do not support the following known FourCC codes:
     //      FourCC CTX1 (Xbox 360 only)
     //      FourCC EAR, EARG, ET2, ET2A (Ericsson Texture Compression)
+    //      FourCC MET1 (a.k.a. D3DFMT_MULTI2_ARGB8; rarely supported by any hardware)
 
     DXGI_FORMAT GetDXGIFormat(const DDS_HEADER& hdr, const DDS_PIXELFORMAT& ddpf,
         DDS_FLAGS flags,
@@ -217,17 +220,16 @@ namespace
                     if (ddpf.fourCC == entry->ddpf.fourCC)
                         break;
                 }
-                else if (ddpfFlags == entry->ddpf.flags)
+                else if ((ddpfFlags == entry->ddpf.flags) && (ddpf.RGBBitCount == entry->ddpf.RGBBitCount))
                 {
                     if (entry->ddpf.flags & DDS_PAL8)
                     {
-                        if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount)
+                        // PAL8 / PAL8A
                         break;
                     }
                     else if (entry->ddpf.flags & DDS_ALPHA)
                     {
-                        if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount
-                            && ddpf.ABitMask == entry->ddpf.ABitMask)
+                        if (ddpf.ABitMask == entry->ddpf.ABitMask)
                             break;
                     }
                     else if (entry->ddpf.flags & DDS_LUMINANCE)
@@ -235,31 +237,37 @@ namespace
                         if (entry->ddpf.flags & DDS_ALPHAPIXELS)
                         {
                             // LUMINANCEA
-                            if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount
-                                && ddpf.RBitMask == entry->ddpf.RBitMask
+                            if (ddpf.RBitMask == entry->ddpf.RBitMask
                                 && ddpf.ABitMask == entry->ddpf.ABitMask)
                                 break;
                         }
                         else
                         {
                             // LUMINANCE
-                            if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount
-                                && ddpf.RBitMask == entry->ddpf.RBitMask)
+                            if (ddpf.RBitMask == entry->ddpf.RBitMask)
                                 break;
                         }
                     }
                     else if (entry->ddpf.flags & DDS_BUMPDUDV)
                     {
-                        if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount
-                            && ddpf.RBitMask == entry->ddpf.RBitMask
-                            && ddpf.GBitMask == entry->ddpf.GBitMask
-                            && ddpf.BBitMask == entry->ddpf.BBitMask
+                        if (entry->ddpf.flags & DDS_ALPHAPIXELS)
+                        {
+                            // BUMPDUDVA
+                            if (ddpf.RBitMask == entry->ddpf.RBitMask
                                 && ddpf.ABitMask == entry->ddpf.ABitMask)
+                            {
+                                flags &= ~DDS_FLAGS_NO_R10B10G10A2_FIXUP;
                                 break;
                             }
-                    else if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount)
+                        }
+                        else
                         {
-                        if (entry->ddpf.flags & DDS_ALPHAPIXELS)
+                            // BUMPDUDV
+                            if (ddpf.RBitMask == entry->ddpf.RBitMask)
+                                break;
+                        }
+                    }
+                    else if (entry->ddpf.flags & DDS_ALPHAPIXELS)
                     {
                         // RGBA
                         if (ddpf.RBitMask == entry->ddpf.RBitMask
@@ -279,7 +287,6 @@ namespace
                 }
             }
         }
-        }
 
         if (index >= MAP_SIZE)
             return DXGI_FORMAT_UNKNOWN;
@@ -326,13 +333,13 @@ namespace
             *ddPixelFormat = {};
         }
 
-        if (size < (sizeof(DDS_HEADER) + sizeof(uint32_t)))
+        if (size < DDS_MIN_HEADER_SIZE)
         {
             return HRESULT_E_INVALID_DATA;
         }
 
         // DDS files always start with the same magic number ("DDS ")
-        auto const dwMagicNumber = *static_cast<const uint32_t*>(pSource);
+        const auto dwMagicNumber = *static_cast<const uint32_t*>(pSource);
         if (dwMagicNumber != DDS_MAGIC)
         {
             return E_FAIL;
@@ -370,7 +377,9 @@ namespace
 
         metadata.mipLevels = pHeader->mipMapCount;
         if (metadata.mipLevels == 0)
+        {
             metadata.mipLevels = 1;
+        }
 
         // Check for DX10 extension
         if ((pHeader->ddspf.flags & DDS_FOURCC)
@@ -384,18 +393,18 @@ namespace
             }
 
             // Buffer must be big enough for both headers and magic value
-            if (size < (sizeof(DDS_HEADER) + sizeof(uint32_t) + sizeof(DDS_HEADER_DXT10)))
+            if (size < DDS_DX10_HEADER_SIZE)
             {
                 return E_FAIL;
             }
 
-            auto d3d10ext = reinterpret_cast<const DDS_HEADER_DXT10*>(static_cast<const uint8_t*>(pSource) + sizeof(uint32_t) + sizeof(DDS_HEADER));
+            auto d3d10ext = reinterpret_cast<const DDS_HEADER_DXT10*>(static_cast<const uint8_t*>(pSource) + DDS_MIN_HEADER_SIZE);
             convFlags |= CONV_FLAGS_DX10;
 
             metadata.arraySize = d3d10ext->arraySize;
             if (metadata.arraySize == 0)
             {
-                return HRESULT_E_INVALID_DATA;
+                metadata.arraySize = 1;
             }
 
             metadata.format = d3d10ext->dxgiFormat;
@@ -639,6 +648,12 @@ namespace
             }
         }
 
+        // Special-handling flag for ignoring mipchains on simple DDS files
+        if ((flags & DDS_FLAGS_IGNORE_MIPS) && (metadata.arraySize == 1))
+        {
+            metadata.mipLevels = 1;
+        }
+
         // Handle DDS-specific metadata
         if (ddPixelFormat)
         {
@@ -664,7 +679,7 @@ _Use_decl_annotations_
 HRESULT DirectX::EncodeDDSHeader(
     const TexMetadata& metadata,
     DDS_FLAGS flags,
-    void* pDestination,
+    uint8_t* pDestination,
     size_t maxsize,
     size_t& required) noexcept
 {
@@ -824,7 +839,7 @@ HRESULT DirectX::EncodeDDSHeader(
         }
     }
 
-    required = sizeof(uint32_t) + sizeof(DDS_HEADER);
+    required = DDS_MIN_HEADER_SIZE;
 
     if (ddpf.size == 0)
     {
@@ -840,7 +855,7 @@ HRESULT DirectX::EncodeDDSHeader(
     if (maxsize < required)
         return E_NOT_SUFFICIENT_BUFFER;
 
-    *static_cast<uint32_t*>(pDestination) = DDS_MAGIC;
+    *reinterpret_cast<uint32_t*>(pDestination) = DDS_MAGIC;
 
     auto header = reinterpret_cast<DDS_HEADER*>(static_cast<uint8_t*>(pDestination) + sizeof(uint32_t));
     assert(header);
@@ -996,7 +1011,10 @@ namespace
         TEXP_LEGACY_B4G4R4A4,
         TEXP_LEGACY_L8,
         TEXP_LEGACY_L16,
-        TEXP_LEGACY_A8L8
+        TEXP_LEGACY_A8L8,
+        TEXP_LEGACY_L6V5U5,
+        TEXP_LEGACY_X8L8V8U8,
+        TEXP_LEGACY_A2W10V10U10
     };
 
     constexpr TEXP_LEGACY_FORMAT FindLegacyFormat(uint32_t flags) noexcept
@@ -1023,6 +1041,12 @@ namespace
             lformat = TEXP_LEGACY_L16;
         else if (flags & CONV_FLAGS_A8L8)
             lformat = TEXP_LEGACY_A8L8;
+        else if (flags & CONV_FLAGS_L6V5U5)
+            lformat = TEXP_LEGACY_L6V5U5;
+        else if (flags & CONV_FLAGS_L8U8V8)
+            lformat = TEXP_LEGACY_X8L8V8U8;
+        else if (flags & CONV_FLAGS_WUV10)
+            lformat = TEXP_LEGACY_A2W10V10U10;
 
         return lformat;
     }
@@ -1328,11 +1352,120 @@ namespace
             }
             return false;
 
+        case TEXP_LEGACY_L6V5U5:
+            if (outFormat != DXGI_FORMAT_R8G8B8A8_UNORM)
+                return false;
+
+            // D3DFMT_L6V5U5 -> DXGI_FORMAT_R8G8B8A8_UNORM (LUVA)
+            if (inSize >= 2 && outSize >= 4)
+            {
+                const uint16_t* __restrict sPtr = static_cast<const uint16_t*>(pSource);
+                uint32_t * __restrict dPtr = static_cast<uint32_t*>(pDestination);
+
+                for (size_t ocount = 0, icount = 0; ((icount < (inSize - 1)) && (ocount < (outSize - 3))); icount += 2, ocount += 4)
+                {
+                    const uint16_t t = *(sPtr++);
+
+                    // Converts unsigned 6-bit/signed 5-bit/signed 5-bit bump luminance to 8:8:8:8 unsigned
+                    uint32_t t1 = ((t & 0xFC00) >> 8) | ((t & 0xC000) >> 14);
+
+                    constexpr int m = 1U << 4;
+                    int8_t v = ((((t >> 5) & 0x1f) ^ m) - m) + 16;
+                    int8_t u = (((t & 0x1f) ^ m) - m) + 16;
+
+                    auto t2 = static_cast<uint32_t>(u << 3 | u >> 2);
+                    auto t3 = static_cast<uint32_t>(v << 3 | v >> 2);
+
+                    *(dPtr++) = t1 | (t2 << 8) | (t3 << 16) | 0xff000000;
+                }
+                return true;
+            }
+            return false;
+
         default:
             return false;
         }
     }
 
+    _Success_(return)
+        bool LegacyConvertScanline(
+            _Out_writes_bytes_(outSize) void* pDestination,
+            size_t outSize,
+            _In_ DXGI_FORMAT outFormat,
+            _In_reads_bytes_(inSize) const void* pSource,
+            size_t inSize,
+            _In_ TEXP_LEGACY_FORMAT inFormat,
+            uint32_t tflags) noexcept
+    {
+        assert(pDestination && outSize > 0);
+        assert(pSource && inSize > 0);
+
+        switch (inFormat)
+        {
+        case TEXP_LEGACY_X8L8V8U8:
+            if (outFormat != DXGI_FORMAT_R8G8B8A8_UNORM)
+                return false;
+
+            // D3DFMT_X8L8V8U8 -> DXGI_FORMAT_R8G8B8A8_UNORM (LUVA)
+            if (inSize >= 4 && outSize >= 4)
+            {
+                auto sPtr = static_cast<const uint32_t*>(pSource);
+                auto dPtr = static_cast<uint32_t*>(pDestination);
+
+                for (size_t ocount = 0, icount = 0; ((icount < (inSize - 3)) && (ocount < (outSize - 3))); icount += 4, ocount += 4)
+                {
+                    const uint32_t t = *(sPtr++);
+
+                    // Converts 8-bit unsigned / 8-bit signed / 8-bit signed to 8:8:8:8 unsigned
+                    uint32_t t1 = (t >> 16) & 0xff;
+                    constexpr int m = 1U << 7;
+                    uint32_t v = ((((t >> 8) & 0xff) ^ m) - m) + 128;
+                    uint32_t u = (((t & 0xff) ^ m) - m) + 128;
+
+                    uint32_t t2 = u << 8;
+                    uint32_t t3 = v << 16;
+
+                    *(dPtr++) = t1 | t2 | t3 | 0xff000000;
+                }
+                return true;
+            }
+            return false;
+
+        case TEXP_LEGACY_A2W10V10U10:
+            if (outFormat != DXGI_FORMAT_R10G10B10A2_UNORM)
+                return false;
+
+            // D3DFMT_A2W10V10U10 -> DXGI_FORMAT_R10G10B10A2_UNORM (UVWA)
+            if (inSize >= 4 && outSize >= 4)
+            {
+                auto sPtr = static_cast<const uint32_t*>(pSource);
+                auto dPtr = static_cast<uint32_t*>(pDestination);
+
+                for (size_t ocount = 0, icount = 0; ((icount < (inSize - 3)) && (ocount < (outSize - 3))); icount += 4, ocount += 4)
+                {
+                    const uint32_t t = *(sPtr++);
+
+                    // Converts 2-bit unsigned / 10-bit signed / 10-bit signed / 10-bit signed to 2:10:10:10 unsigned
+                    constexpr int m = 1U << 9;
+                    uint32_t w = ((((t >> 20) & 0x3ff) ^ m) - m) + 512;
+                    uint32_t v = ((((t >> 10) & 0x3ff) ^ m) - m) + 512;
+                    uint32_t u = (((t & 0x3ff) ^ m) - m) + 512;
+
+                    uint32_t t1 = u;
+                    uint32_t t2 = v << 10;
+                    uint32_t t3 = w << 20;
+                    uint32_t ta = (tflags & TEXP_SCANLINE_SETALPHA) ? 0xC0000000 : (t & 0xC0000000);
+
+                    *(dPtr++) = t1 | t2 | t3 | ta;
+                }
+                return true;
+            }
+            return false;
+
+        default:
+            return false;
+        }
+    }
 
     //-------------------------------------------------------------------------------------
     // Converts or copies image data from pPixels into scratch image data
@@ -1356,7 +1489,7 @@ namespace
         {
             if (convFlags & CONV_FLAGS_888)
                 cpFlags |= CP_FLAGS_24BPP;
-            else if (convFlags & (CONV_FLAGS_565 | CONV_FLAGS_5551 | CONV_FLAGS_4444 | CONV_FLAGS_8332 | CONV_FLAGS_A8P8 | CONV_FLAGS_L16 | CONV_FLAGS_A8L8))
+            else if (convFlags & (CONV_FLAGS_565 | CONV_FLAGS_5551 | CONV_FLAGS_4444 | CONV_FLAGS_8332 | CONV_FLAGS_A8P8 | CONV_FLAGS_L16 | CONV_FLAGS_A8L8 | CONV_FLAGS_L6V5U5))
                 cpFlags |= CP_FLAGS_16BPP;
             else if (convFlags & (CONV_FLAGS_44 | CONV_FLAGS_332 | CONV_FLAGS_PAL8 | CONV_FLAGS_L8))
                 cpFlags |= CP_FLAGS_8BPP;
@@ -1502,13 +1635,18 @@ namespace
                                 }
                                 else if (convFlags & CONV_FLAGS_SWIZZLE)
                                 {
-                                    SwizzleScanline(pDest, dpitch, pSrc, spitch,
-                                        metadata.format, tflags);
+                                    SwizzleScanline(pDest, dpitch, pSrc, spitch, metadata.format, tflags);
+                                }
+                                else if (convFlags & (CONV_FLAGS_L8U8V8 | CONV_FLAGS_WUV10))
+                                {
+                                    const TEXP_LEGACY_FORMAT lformat = FindLegacyFormat(convFlags);
+                                    if (!LegacyConvertScanline(pDest, dpitch, metadata.format,
+                                        pSrc, spitch, lformat, tflags))
+                                        return E_FAIL;
                                 }
                                 else
                                 {
-                                    CopyScanline(pDest, dpitch, pSrc, spitch,
-                                        metadata.format, tflags);
+                                    CopyScanline(pDest, dpitch, pSrc, spitch, metadata.format, tflags);
                                 }
 
                                 pSrc += spitch;
@@ -1605,6 +1743,13 @@ namespace
                                 {
                                     SwizzleScanline(pDest, dpitch, pSrc, spitch, metadata.format, tflags);
                                 }
+                                else if (convFlags & (CONV_FLAGS_L8U8V8 | CONV_FLAGS_WUV10))
+                                {
+                                    const TEXP_LEGACY_FORMAT lformat = FindLegacyFormat(convFlags);
+                                    if (!LegacyConvertScanline(pDest, dpitch, metadata.format,
+                                        pSrc, spitch, lformat, tflags))
+                                        return E_FAIL;
+                                }
                                 else
                                 {
                                     CopyScanline(pDest, dpitch, pSrc, spitch, metadata.format, tflags);
@@ -1662,6 +1807,14 @@ namespace
                 {
                     SwizzleScanline(pPixels, rowPitch, pPixels, rowPitch, metadata.format, tflags);
                 }
+                else if (convFlags & (CONV_FLAGS_L8U8V8 | CONV_FLAGS_WUV10))
+                {
+                    const TEXP_LEGACY_FORMAT lformat = FindLegacyFormat(convFlags);
+                    if (!LegacyConvertScanline(pPixels, rowPitch, metadata.format, pPixels, rowPitch, lformat, tflags))
+                    {
+                        return E_UNEXPECTED;
+                    }
+                }
                 else
                 {
                     CopyScanline(pPixels, rowPitch, pPixels, rowPitch, metadata.format, tflags);
@@ -1686,7 +1839,7 @@ namespace
 
 _Use_decl_annotations_
 HRESULT DirectX::GetMetadataFromDDSMemory(
-    const void* pSource,
+    const uint8_t* pSource,
     size_t size,
     DDS_FLAGS flags,
     TexMetadata& metadata) noexcept
@@ -1696,7 +1849,7 @@ HRESULT DirectX::GetMetadataFromDDSMemory(
 
 _Use_decl_annotations_
 HRESULT DirectX::GetMetadataFromDDSMemoryEx(
-    const void* pSource,
+    const uint8_t* pSource,
     size_t size,
     DDS_FLAGS flags,
     TexMetadata& metadata,
@@ -1729,12 +1882,10 @@ HRESULT DirectX::GetMetadataFromDDSFileEx(
         return E_INVALIDARG;
 
 #ifdef _WIN32
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-    ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
-        FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
-#endif
+    ScopedHandle hFile(safe_handle(CreateFile2(
+        szFile,
+        GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
+        nullptr)));
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -1774,24 +1925,24 @@ HRESULT DirectX::GetMetadataFromDDSFileEx(
 #endif
 
     // Need at least enough data to fill the standard header and magic number to be a valid DDS
-    if (len < (sizeof(DDS_HEADER) + sizeof(uint32_t)))
+    if (len < DDS_MIN_HEADER_SIZE)
     {
         return E_FAIL;
     }
 
     // Read the header in (including extended header if present)
-    uint8_t header[MAX_HEADER_SIZE] = {};
+    uint8_t header[DDS_DX10_HEADER_SIZE] = {};
 
 #ifdef _WIN32
     DWORD bytesRead = 0;
-    if (!ReadFile(hFile.get(), header, MAX_HEADER_SIZE, &bytesRead, nullptr))
+    if (!ReadFile(hFile.get(), header, DDS_DX10_HEADER_SIZE, &bytesRead, nullptr))
     {
         return HRESULT_FROM_WIN32(GetLastError());
     }
 
-    auto const headerLen = static_cast<size_t>(bytesRead);
+    const auto headerLen = static_cast<size_t>(bytesRead);
 #else
-    auto const headerLen = std::min<size_t>(len, MAX_HEADER_SIZE);
+    const auto headerLen = std::min<size_t>(len, DDS_DX10_HEADER_SIZE);
 
     inFile.read(reinterpret_cast<char*>(header), headerLen);
     if (!inFile)
@@ -1808,7 +1959,7 @@ HRESULT DirectX::GetMetadataFromDDSFileEx(
 //-------------------------------------------------------------------------------------
 _Use_decl_annotations_
 HRESULT DirectX::LoadFromDDSMemory(
-    const void* pSource,
+    const uint8_t* pSource,
     size_t size,
     DDS_FLAGS flags,
     TexMetadata* metadata,
@@ -1819,7 +1970,7 @@ HRESULT DirectX::LoadFromDDSMemory(
 
 _Use_decl_annotations_
 HRESULT DirectX::LoadFromDDSMemoryEx(
-    const void* pSource,
+    const uint8_t* pSource,
     size_t size,
     DDS_FLAGS flags,
     TexMetadata* metadata,
@@ -1837,7 +1988,7 @@ HRESULT DirectX::LoadFromDDSMemoryEx(
     if (FAILED(hr))
         return hr;
 
-    size_t offset = sizeof(uint32_t) + sizeof(DDS_HEADER);
+    size_t offset = DDS_MIN_HEADER_SIZE;
     if (convFlags & CONV_FLAGS_DX10)
         offset += sizeof(DDS_HEADER_DXT10);
 
@@ -1853,10 +2004,36 @@ HRESULT DirectX::LoadFromDDSMemoryEx(
             return E_FAIL;
     }
 
+    size_t remaining = size - offset;
+    if (remaining == 0)
+        return E_FAIL;
+
     hr = image.Initialize(mdata);
     if (FAILED(hr))
         return hr;
 
+    if (flags & DDS_FLAGS_PERMISSIVE)
+    {
+        // For cubemaps, DDS_HEADER_DXT10.arraySize is supposed to be 'number of cubes'.
+        // This handles cases where the value is incorrectly written as the original 6*numCubes value.
+        if ((mdata.miscFlags & TEX_MISC_TEXTURECUBE)
+            && (convFlags & CONV_FLAGS_DX10)
+            && (image.GetPixelsSize() > remaining)
+            && ((mdata.arraySize % 6) == 0))
+        {
+            mdata.arraySize = mdata.arraySize / 6;
+            hr = image.Initialize(mdata);
+            if (FAILED(hr))
+                return hr;
+
+            if (image.GetPixelsSize() > remaining)
+            {
+                image.Release();
+                return HRESULT_E_HANDLE_EOF;
+            }
+        }
+    }
+
     CP_FLAGS cflags = CP_FLAGS_NONE;
     if (flags & DDS_FLAGS_LEGACY_DWORD)
     {
@@ -1915,12 +2092,10 @@ HRESULT DirectX::LoadFromDDSFileEx(
     image.Release();
 
 #ifdef _WIN32
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-    ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
-        FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
-#endif
+    ScopedHandle hFile(safe_handle(CreateFile2(
+        szFile,
+        GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
+        nullptr)));
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -1958,24 +2133,24 @@ HRESULT DirectX::LoadFromDDSFileEx(
 #endif
 
     // Need at least enough data to fill the standard header and magic number to be a valid DDS
-    if (len < (sizeof(DDS_HEADER) + sizeof(uint32_t)))
+    if (len < DDS_MIN_HEADER_SIZE)
     {
         return E_FAIL;
     }
 
     // Read the header in (including extended header if present)
-    uint8_t header[MAX_HEADER_SIZE] = {};
+    uint8_t header[DDS_DX10_HEADER_SIZE] = {};
 
 #ifdef _WIN32
     DWORD bytesRead = 0;
-    if (!ReadFile(hFile.get(), header, MAX_HEADER_SIZE, &bytesRead, nullptr))
+    if (!ReadFile(hFile.get(), header, DDS_DX10_HEADER_SIZE, &bytesRead, nullptr))
     {
         return HRESULT_FROM_WIN32(GetLastError());
     }
 
-    auto const headerLen = static_cast<size_t>(bytesRead);
+    const auto headerLen = static_cast<size_t>(bytesRead);
 #else
-    auto const headerLen = std::min<size_t>(len, MAX_HEADER_SIZE);
+    const auto headerLen = std::min<size_t>(len, DDS_DX10_HEADER_SIZE);
 
     inFile.read(reinterpret_cast<char*>(header), headerLen);
     if (!inFile)
@@ -1988,24 +2163,24 @@ HRESULT DirectX::LoadFromDDSFileEx(
     if (FAILED(hr))
         return hr;
 
-    size_t offset = MAX_HEADER_SIZE;
+    size_t offset = DDS_DX10_HEADER_SIZE;
 
     if (!(convFlags & CONV_FLAGS_DX10))
     {
     #ifdef _WIN32
             // Must reset file position since we read more than the standard header above
-        const LARGE_INTEGER filePos = { { sizeof(uint32_t) + sizeof(DDS_HEADER), 0 } };
+        const LARGE_INTEGER filePos = { { DDS_MIN_HEADER_SIZE, 0 } };
         if (!SetFilePointerEx(hFile.get(), filePos, nullptr, FILE_BEGIN))
         {
             return HRESULT_FROM_WIN32(GetLastError());
         }
     #else
-        inFile.seekg(sizeof(uint32_t) + sizeof(DDS_HEADER), std::ios::beg);
+        inFile.seekg(DDS_MIN_HEADER_SIZE, std::ios::beg);
         if (!inFile)
             return E_FAIL;
     #endif
 
-        offset = sizeof(uint32_t) + sizeof(DDS_HEADER);
+        offset = DDS_MIN_HEADER_SIZE;
     }
 
     std::unique_ptr<uint32_t[]> pal8;
@@ -2044,6 +2219,28 @@ HRESULT DirectX::LoadFromDDSFileEx(
     if (FAILED(hr))
         return hr;
 
+    if (flags & DDS_FLAGS_PERMISSIVE)
+    {
+        // For cubemaps, DDS_HEADER_DXT10.arraySize is supposed to be 'number of cubes'.
+        // This handles cases where the value is incorrectly written as the original 6*numCubes value.
+        if ((mdata.miscFlags & TEX_MISC_TEXTURECUBE)
+            && (convFlags & CONV_FLAGS_DX10)
+            && (image.GetPixelsSize() > remaining)
+            && ((mdata.arraySize % 6) == 0))
+        {
+            mdata.arraySize = mdata.arraySize / 6;
+            hr = image.Initialize(mdata);
+            if (FAILED(hr))
+                return hr;
+
+            if (image.GetPixelsSize() > remaining)
+            {
+                image.Release();
+                return HRESULT_E_HANDLE_EOF;
+            }
+        }
+    }
+
     if ((convFlags & CONV_FLAGS_EXPAND) || (flags & (DDS_FLAGS_LEGACY_DWORD | DDS_FLAGS_BAD_DXTN_TAILS)))
     {
         std::unique_ptr<uint8_t[]> temp(new (std::nothrow) uint8_t[remaining]);
@@ -2112,7 +2309,7 @@ HRESULT DirectX::LoadFromDDSFileEx(
         }
 
     #ifdef _WIN32
-        auto const pixelBytes = static_cast<DWORD>(image.GetPixelsSize());
+        const auto pixelBytes = static_cast<DWORD>(image.GetPixelsSize());
         if (!ReadFile(hFile.get(), image.GetPixels(), pixelBytes, &bytesRead, nullptr))
         {
             image.Release();
@@ -2133,7 +2330,7 @@ HRESULT DirectX::LoadFromDDSFileEx(
         }
     #endif
 
-        if (convFlags & (CONV_FLAGS_SWIZZLE | CONV_FLAGS_NOALPHA))
+        if (convFlags & (CONV_FLAGS_SWIZZLE | CONV_FLAGS_NOALPHA | CONV_FLAGS_L8U8V8 | CONV_FLAGS_WUV10))
         {
             // Swizzle/copy image in place
             hr = CopyImageInPlace(convFlags, image);
@@ -2206,7 +2403,7 @@ HRESULT DirectX::SaveToDDSMemory(
     if (FAILED(hr))
         return hr;
 
-    auto pDestination = static_cast<uint8_t*>(blob.GetBufferPointer());
+    auto pDestination = blob.GetBufferPointer();
     assert(pDestination);
 
     hr = EncodeDDSHeader(metadata, flags, pDestination, blob.GetBufferSize(), required);
@@ -2219,7 +2416,7 @@ HRESULT DirectX::SaveToDDSMemory(
     size_t remaining = blob.GetBufferSize() - required;
     pDestination += required;
 
-    if (!remaining)
+    if (remaining == 0)
     {
         blob.Release();
         return E_FAIL;
@@ -2391,21 +2588,17 @@ HRESULT DirectX::SaveToDDSFile(
         return E_INVALIDARG;
 
     // Create DDS Header
-    uint8_t header[MAX_HEADER_SIZE];
+    uint8_t header[DDS_DX10_HEADER_SIZE];
     size_t required;
-    HRESULT hr = EncodeDDSHeader(metadata, flags, header, MAX_HEADER_SIZE, required);
+    HRESULT hr = EncodeDDSHeader(metadata, flags, header, DDS_DX10_HEADER_SIZE, required);
     if (FAILED(hr))
         return hr;
 
     // Create file and write header
 #ifdef _WIN32
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-    ScopedHandle hFile(safe_handle(CreateFile2(szFile,
+    ScopedHandle hFile(safe_handle(CreateFile2(
+        szFile,
         GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(szFile,
-        GENERIC_WRITE | DELETE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr)));
-#endif
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());

DirectXTex/DirectXTexHDR.cpp

@@ -94,7 +94,7 @@ namespace
     // Decodes HDR header
     //-------------------------------------------------------------------------------------
     HRESULT DecodeHDRHeader(
-        _In_reads_bytes_(size) const void* pSource,
+        _In_reads_bytes_(size) const uint8_t* pSource,
         size_t size,
         _Out_ TexMetadata& metadata,
         size_t& offset,
@@ -121,7 +121,7 @@ namespace
 
         // Process first part of header
         bool formatFound = false;
-        auto info = static_cast<const char*>(pSource);
+        auto info = reinterpret_cast<const char*>(pSource);
         while (size > 0)
         {
             if (*info == '\n')
@@ -163,7 +163,8 @@ namespace
                 formatFound = true;
 
                 const size_t len = FindEOL(info, size);
-                if (len == size_t(-1))
+                if (len == size_t(-1)
+                    || len < 1)
                 {
                     return E_FAIL;
                 }
@@ -207,7 +208,8 @@ namespace
             else
             {
                 const size_t len = FindEOL(info, size);
-                if (len == size_t(-1))
+                if (len == size_t(-1)
+                    || len < 1)
                 {
                     return E_FAIL;
                 }
@@ -308,7 +310,7 @@ namespace
             return E_FAIL;
         }
 
-        offset = size_t(info - static_cast<const char*>(pSource));
+        offset = size_t(info - reinterpret_cast<const char*>(pSource));
 
         metadata.width = width;
         metadata.height = height;
@@ -598,7 +600,7 @@ namespace
 // Obtain metadata from HDR file in memory/on disk
 //-------------------------------------------------------------------------------------
 _Use_decl_annotations_
-HRESULT DirectX::GetMetadataFromHDRMemory(const void* pSource, size_t size, TexMetadata& metadata) noexcept
+HRESULT DirectX::GetMetadataFromHDRMemory(const uint8_t* pSource, size_t size, TexMetadata& metadata) noexcept
 {
     if (!pSource || size == 0)
         return E_INVALIDARG;
@@ -615,12 +617,10 @@ HRESULT DirectX::GetMetadataFromHDRFile(const wchar_t* szFile, TexMetadata& meta
         return E_INVALIDARG;
 
 #ifdef _WIN32
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-    ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
-        FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
-#endif
+    ScopedHandle hFile(safe_handle(CreateFile2(
+        szFile,
+        GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
+        nullptr)));
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -675,9 +675,9 @@ HRESULT DirectX::GetMetadataFromHDRFile(const wchar_t* szFile, TexMetadata& meta
         return HRESULT_FROM_WIN32(GetLastError());
     }
 
-    auto const headerLen = static_cast<size_t>(bytesRead);
+    const auto headerLen = static_cast<size_t>(bytesRead);
 #else
-    auto const headerLen = std::min<size_t>(sizeof(header), len);
+    const auto headerLen = std::min<size_t>(sizeof(header), len);
 
     inFile.read(reinterpret_cast<char*>(header), headerLen);
     if (!inFile)
@@ -694,7 +694,7 @@ HRESULT DirectX::GetMetadataFromHDRFile(const wchar_t* szFile, TexMetadata& meta
 // Load a HDR file in memory
 //-------------------------------------------------------------------------------------
 _Use_decl_annotations_
-HRESULT DirectX::LoadFromHDRMemory(const void* pSource, size_t size, TexMetadata* metadata, ScratchImage& image) noexcept
+HRESULT DirectX::LoadFromHDRMemory(const uint8_t* pSource, size_t size, TexMetadata* metadata, ScratchImage& image) noexcept
 {
     if (!pSource || size == 0)
         return E_INVALIDARG;
@@ -715,7 +715,7 @@ HRESULT DirectX::LoadFromHDRMemory(const void* pSource, size_t size, TexMetadata
     if (remaining == 0)
         return E_FAIL;
 
-    hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1);
+    hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1, CP_FLAGS_LIMIT_4GB);
     if (FAILED(hr))
         return hr;
 
@@ -890,7 +890,7 @@ HRESULT DirectX::LoadFromHDRMemory(const void* pSource, size_t size, TexMetadata
 
         for (size_t j = 0; j < image.GetPixelsSize(); j += 16)
         {
-            auto const exponent = static_cast<int>(fdata[3]);
+            const auto exponent = static_cast<int>(fdata[3]);
             fdata[0] = 1.0f / exposure*ldexpf((fdata[0] + 0.5f), exponent - (128 + 8));
             fdata[1] = 1.0f / exposure*ldexpf((fdata[1] + 0.5f), exponent - (128 + 8));
             fdata[2] = 1.0f / exposure*ldexpf((fdata[2] + 0.5f), exponent - (128 + 8));
@@ -919,12 +919,10 @@ HRESULT DirectX::LoadFromHDRFile(const wchar_t* szFile, TexMetadata* metadata, S
     image.Release();
 
 #ifdef _WIN32
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-    ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
-        FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
-#endif
+    ScopedHandle hFile(safe_handle(CreateFile2(
+        szFile,
+        GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
+        nullptr)));
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -1043,7 +1041,7 @@ HRESULT DirectX::SaveToHDRMemory(const Image& image, Blob& blob) noexcept
         return hr;
 
     // Copy header
-    auto dPtr = static_cast<uint8_t*>(blob.GetBufferPointer());
+    auto dPtr = blob.GetBufferPointer();
     assert(dPtr != nullptr);
     memcpy(dPtr, header, headerLen);
     dPtr += headerLen;
@@ -1095,7 +1093,7 @@ HRESULT DirectX::SaveToHDRMemory(const Image& image, Blob& blob) noexcept
     }
 #endif
 
-    hr = blob.Trim(size_t(dPtr - static_cast<uint8_t*>(blob.GetBufferPointer())));
+    hr = blob.Trim(size_t(dPtr - blob.GetConstBufferPointer()));
     if (FAILED(hr))
     {
         blob.Release();
@@ -1142,13 +1140,9 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce
 
     // Create file and write header
 #ifdef _WIN32
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-    ScopedHandle hFile(safe_handle(CreateFile2(szFile,
+    ScopedHandle hFile(safe_handle(CreateFile2(
+        szFile,
         GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(szFile,
-        GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr)));
-#endif
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -1180,9 +1174,9 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce
 
         // Write blob
     #ifdef _WIN32
-        auto const bytesToWrite = static_cast<const DWORD>(blob.GetBufferSize());
+        const auto bytesToWrite = static_cast<const DWORD>(blob.GetBufferSize());
         DWORD bytesWritten;
-        if (!WriteFile(hFile.get(), blob.GetBufferPointer(), bytesToWrite, &bytesWritten, nullptr))
+        if (!WriteFile(hFile.get(), blob.GetConstBufferPointer(), bytesToWrite, &bytesWritten, nullptr))
         {
             return HRESULT_FROM_WIN32(GetLastError());
         }
@@ -1192,7 +1186,7 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce
             return E_FAIL;
         }
     #else
-        outFile.write(reinterpret_cast<char*>(blob.GetBufferPointer()),
+        outFile.write(reinterpret_cast<const char*>(blob.GetConstBufferPointer()),
             static_cast<std::streamsize>(blob.GetBufferSize()));
 
         if (!outFile)
@@ -1213,7 +1207,7 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce
         sprintf_s(header, g_Header, image.height, image.width);
 
     #ifdef _WIN32
-        auto const headerLen = static_cast<DWORD>(strlen(header));
+        const auto headerLen = static_cast<DWORD>(strlen(header));
 
         DWORD bytesWritten;
         if (!WriteFile(hFile.get(), header, headerLen, &bytesWritten, nullptr))

DirectXTex/DirectXTexImage.cpp

@@ -123,6 +123,12 @@ HRESULT DirectX::Internal::DetermineImageArray(
     }
 #else
     static_assert(sizeof(size_t) == 8, "Not a 64-bit platform!");
+
+    if ((cpFlags & CP_FLAGS_LIMIT_4GB) && (totalPixelSize > UINT32_MAX))
+    {
+        nImages = pixelSize = 0;
+        return HRESULT_E_ARITHMETIC_OVERFLOW;
+    }
 #endif
 
     nImages = nimages;
@@ -455,6 +461,9 @@ HRESULT ScratchImage::Initialize3D(DXGI_FORMAT fmt, size_t width, size_t height,
     if (!IsValid(fmt) || !width || !height || !depth)
         return E_INVALIDARG;
 
+    if (depth > INT16_MAX)
+        return E_INVALIDARG;
+
     if (IsPalettized(fmt))
         return HRESULT_E_NOT_SUPPORTED;
 
@@ -643,6 +652,9 @@ HRESULT ScratchImage::Initialize3DFromImages(const Image* images, size_t depth,
     if (!images || !depth)
         return E_INVALIDARG;
 
+    if (depth > INT16_MAX)
+        return E_INVALIDARG;
+
     const DXGI_FORMAT format = images[0].format;
     const size_t width = images[0].width;
     const size_t height = images[0].height;

DirectXTex/DirectXTexMipmaps.cpp

@@ -71,7 +71,7 @@ namespace
         _In_ IWICBitmap* src,
         _In_ TEX_FILTER_FLAGS filter,
         _In_ const WICPixelFormatGUID& desiredPixelFormat,
-        _COM_Outptr_ IWICBitmap** dest) noexcept
+        __RPC__deref_out_opt /* needed to match WIC annotation */ IWICBitmap** dest) noexcept
     {
         if (!dest)
             return E_POINTER;
@@ -457,16 +457,12 @@ HRESULT DirectX::Internal::ResizeSeparateColorAndAlpha(
             }
             else
             {
-            #if(_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
                 if (iswic2)
                 {
                     colorBytesInPixel = colorBytesPerPixel = 12;
                     colorPixelFormat = GUID_WICPixelFormat96bppRGBFloat;
                 }
                 else
-                #else
-                UNREFERENCED_PARAMETER(iswic2);
-            #endif
                 {
                     colorBytesInPixel = 12;
                     colorBytesPerPixel = 16;
@@ -1150,7 +1146,7 @@ namespace
 
             for (size_t y = 0; y < nheight; ++y)
             {
-                auto const& toY = lfY[y];
+                const auto& toY = lfY[y];
 
                 if (toY.u0 != u0)
                 {
@@ -1180,7 +1176,7 @@ namespace
 
                 for (size_t x = 0; x < nwidth; ++x)
                 {
-                    auto const& toX = lfX[x];
+                    const auto& toX = lfX[x];
 
                     BILINEAR_INTERPOLATE(target[x], toX, toY, row0, row1)
                 }
@@ -1273,7 +1269,7 @@ namespace
 
             for (size_t y = 0; y < nheight; ++y)
             {
-                auto const& toY = cfY[y];
+                const auto& toY = cfY[y];
 
                 // Scanline 1
                 if (toY.u0 != u0)
@@ -1364,7 +1360,7 @@ namespace
 
                 for (size_t x = 0; x < nwidth; ++x)
                 {
-                    auto const& toX = cfX[x];
+                    const auto& toX = cfX[x];
 
                     XMVECTOR C0, C1, C2, C3;
 
@@ -1618,6 +1614,9 @@ namespace
         if (!baseImages || !depth)
             return E_INVALIDARG;
 
+        if (depth > INT16_MAX)
+            return E_INVALIDARG;
+
         assert(levels > 1);
 
         const size_t width = baseImages[0].width;
@@ -1669,6 +1668,9 @@ namespace
         if (!depth || !mipChain.GetImages())
             return E_INVALIDARG;
 
+        if (depth > INT16_MAX)
+            return E_INVALIDARG;
+
         // This assumes that the base images are already placed into the mipChain at the top level... (see _Setup3DMips)
 
         assert(levels > 1);
@@ -1817,6 +1819,9 @@ namespace
         if (!depth || !mipChain.GetImages())
             return E_INVALIDARG;
 
+        if (depth > INT16_MAX)
+            return E_INVALIDARG;
+
         // This assumes that the base images are already placed into the mipChain at the top level... (see _Setup3DMips)
 
         assert(levels > 1);
@@ -1991,6 +1996,9 @@ namespace
         if (!depth || !mipChain.GetImages())
             return E_INVALIDARG;
 
+        if (depth > INT16_MAX)
+            return E_INVALIDARG;
+
         // This assumes that the base images are already placed into the mipChain at the top level... (see _Setup3DMips)
 
         assert(levels > 1);
@@ -2042,7 +2050,7 @@ namespace
 
                 for (size_t slice = 0; slice < ndepth; ++slice)
                 {
-                    auto const& toZ = lfZ[slice];
+                    const auto& toZ = lfZ[slice];
 
                     const Image* srca = mipChain.GetImage(level - 1, 0, toZ.u0);
                     const Image* srcb = mipChain.GetImage(level - 1, 0, toZ.u1);
@@ -2060,7 +2068,7 @@ namespace
 
                     for (size_t y = 0; y < nheight; ++y)
                     {
-                        auto const& toY = lfY[y];
+                        const auto& toY = lfY[y];
 
                         if (toY.u0 != u0)
                         {
@@ -2093,7 +2101,7 @@ namespace
 
                         for (size_t x = 0; x < nwidth; ++x)
                         {
-                            auto const& toX = lfX[x];
+                            const auto& toX = lfX[x];
 
                             TRILINEAR_INTERPOLATE(target[x], toX, toY, toZ, urow0, urow1, vrow0, vrow1)
                         }
@@ -2123,7 +2131,7 @@ namespace
 
                 for (size_t y = 0; y < nheight; ++y)
                 {
-                    auto const& toY = lfY[y];
+                    const auto& toY = lfY[y];
 
                     if (toY.u0 != u0)
                     {
@@ -2153,7 +2161,7 @@ namespace
 
                     for (size_t x = 0; x < nwidth; ++x)
                     {
-                        auto const& toX = lfX[x];
+                        const auto& toX = lfX[x];
 
                         BILINEAR_INTERPOLATE(target[x], toX, toY, urow0, urow1)
                     }
@@ -2186,6 +2194,9 @@ namespace
         if (!depth || !mipChain.GetImages())
             return E_INVALIDARG;
 
+        if (depth > INT16_MAX)
+            return E_INVALIDARG;
+
         // This assumes that the base images are already placed into the mipChain at the top level... (see _Setup3DMips)
 
         assert(levels > 1);
@@ -2249,7 +2260,7 @@ namespace
 
                 for (size_t slice = 0; slice < ndepth; ++slice)
                 {
-                    auto const& toZ = cfZ[slice];
+                    const auto& toZ = cfZ[slice];
 
                     const Image* srca = mipChain.GetImage(level - 1, 0, toZ.u0);
                     const Image* srcb = mipChain.GetImage(level - 1, 0, toZ.u1);
@@ -2271,7 +2282,7 @@ namespace
 
                     for (size_t y = 0; y < nheight; ++y)
                     {
-                        auto const& toY = cfY[y];
+                        const auto& toY = cfY[y];
 
                         // Scanline 1
                         if (toY.u0 != u0)
@@ -2392,7 +2403,7 @@ namespace
 
                         for (size_t x = 0; x < nwidth; ++x)
                         {
-                            auto const& toX = cfX[x];
+                            const auto& toX = cfX[x];
 
                             XMVECTOR D[4];
 
@@ -2437,7 +2448,7 @@ namespace
 
                 for (size_t y = 0; y < nheight; ++y)
                 {
-                    auto const& toY = cfY[y];
+                    const auto& toY = cfY[y];
 
                     // Scanline 1
                     if (toY.u0 != u0)
@@ -2528,7 +2539,7 @@ namespace
 
                     for (size_t x = 0; x < nwidth; ++x)
                     {
-                        auto const& toX = cfX[x];
+                        const auto& toX = cfX[x];
 
                         XMVECTOR C0, C1, C2, C3;
                         CUBIC_INTERPOLATE(C0, toX.x, urow[0][toX.u0], urow[0][toX.u1], urow[0][toX.u2], urow[0][toX.u3]);
@@ -2567,6 +2578,9 @@ namespace
         if (!depth || !mipChain.GetImages())
             return E_INVALIDARG;
 
+        if (depth > INT16_MAX)
+            return E_INVALIDARG;
+
         // This assumes that the base images are already placed into the mipChain at the top level... (see _Setup3DMips)
 
         assert(levels > 1);
@@ -2937,7 +2951,7 @@ HRESULT DirectX::GenerateMipMaps(
         mdata.mipLevels = levels;
         mdata.format = baseImage.format;
 
-        unsigned long filter_select = (filter & TEX_FILTER_MODE_MASK);
+        uint32_t filter_select = (filter & TEX_FILTER_MODE_MASK);
         if (!filter_select)
         {
             // Default filter choice
@@ -3152,7 +3166,7 @@ HRESULT DirectX::GenerateMipMaps(
         TexMetadata mdata2 = metadata;
         mdata2.mipLevels = levels;
 
-        unsigned long filter_select = (filter & TEX_FILTER_MODE_MASK);
+        uint32_t filter_select = (filter & TEX_FILTER_MODE_MASK);
         if (!filter_select)
         {
             // Default filter choice
@@ -3247,6 +3261,9 @@ HRESULT DirectX::GenerateMipMaps3D(
     if (!baseImages || !depth)
         return E_INVALIDARG;
 
+    if (depth > INT16_MAX)
+        return E_INVALIDARG;
+
     if (filter & TEX_FILTER_FORCE_WIC)
         return HRESULT_E_NOT_SUPPORTED;
 
@@ -3279,7 +3296,7 @@ HRESULT DirectX::GenerateMipMaps3D(
 
     HRESULT hr = E_UNEXPECTED;
 
-    unsigned long filter_select = (filter & TEX_FILTER_MODE_MASK);
+    uint32_t filter_select = (filter & TEX_FILTER_MODE_MASK);
     if (!filter_select)
     {
         // Default filter choice
@@ -3355,6 +3372,9 @@ HRESULT DirectX::GenerateMipMaps3D(
     if (!srcImages || !nimages || !IsValid(metadata.format))
         return E_INVALIDARG;
 
+    if (levels > INT16_MAX)
+        return E_INVALIDARG;
+
     if (filter & TEX_FILTER_FORCE_WIC)
         return HRESULT_E_NOT_SUPPORTED;
 
@@ -3395,7 +3415,7 @@ HRESULT DirectX::GenerateMipMaps3D(
 
     static_assert(TEX_FILTER_POINT == 0x100000, "TEX_FILTER_ flag values don't match TEX_FILTER_MODE_MASK");
 
-    unsigned long filter_select = (filter & TEX_FILTER_MODE_MASK);
+    uint32_t filter_select = (filter & TEX_FILTER_MODE_MASK);
     if (!filter_select)
     {
         // Default filter choice

DirectXTex/DirectXTexP.h

@@ -40,17 +40,24 @@
 // C5264 'const' variable is not used
 // 26812: The enum type 'x' is unscoped. Prefer 'enum class' over 'enum' (Enum.3).
 
-// Windows 8.1 SDK related Off by default warnings
-#pragma warning(disable : 4471 4917 4986 5029)
+#if defined(_XBOX_ONE) && defined(_TITLE)
+// Xbox One XDK related Off by default warnings
+#pragma warning(disable : 4471 4643 4917 4986 5029 5038 5040 5043 5204 5246 5256 5262 5267)
 // C4471 forward declaration of an unscoped enumeration must have an underlying type
+// C4643 Forward declaring in namespace std is not permitted by the C++ Standard
 // C4917 a GUID can only be associated with a class, interface or namespace
 // C4986 exception specification does not match previous declaration
 // C5029 nonstandard extension used
-
-// Xbox One XDK related Off by default warnings
-#pragma warning(disable : 4643)
-// C4643 Forward declaring in namespace std is not permitted by the C++ Standard
-#endif
+// C5038 data member 'X' will be initialized after data member 'Y'
+// C5040 dynamic exception specifications are valid only in C++14 and earlier; treating as noexcept(false)
+// C5043 exception specification does not match previous declaration
+// C5204 class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly
+// C5246 'anonymous struct or union': the initialization of a subobject should be wrapped in braces
+// C5256 a non-defining declaration of an enumeration with a fixed underlying type is only permitted as a standalone declaration
+// C5262 implicit fall-through occurs here; are you missing a break statement?
+// C5267 definition of implicit copy constructor for 'X' is deprecated because it has a user-provided assignment operator
+#endif // _XBOX_ONE && _TITLE
+#endif // _MSC_VER
 
 #ifdef __INTEL_COMPILER
 #pragma warning(disable : 161)
@@ -125,7 +132,7 @@
 #endif
 #include <d3d11_4.h>
 #else
-#include <d3d11_1.h>
+#include <d3d11_2.h>
 #endif
 #else // !WIN32
 #include <wsl/winadapter.h>
@@ -198,6 +205,9 @@ using WICPixelFormatGUID = GUID;
 #define E_BOUNDS static_cast<HRESULT>(0x8000000BL)
 #endif
 
+// HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)
+#define HRESULT_ERROR_FILE_NOT_FOUND static_cast<HRESULT>(0x80070002)
+
 // HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW)
 #define HRESULT_E_ARITHMETIC_OVERFLOW static_cast<HRESULT>(0x80070216L)
 

DirectXTex/DirectXTexResize.cpp

@@ -414,7 +414,7 @@ namespace
 
         for (size_t y = 0; y < destImage.height; ++y)
         {
-            auto const& toY = lfY[y];
+            const auto& toY = lfY[y];
 
             if (toY.u0 != u0)
             {
@@ -444,7 +444,7 @@ namespace
 
             for (size_t x = 0; x < destImage.width; ++x)
             {
-                auto const& toX = lfX[x];
+                const auto& toX = lfX[x];
 
                 BILINEAR_INTERPOLATE(target[x], toX, toY, row0, row1)
             }
@@ -511,7 +511,7 @@ namespace
 
         for (size_t y = 0; y < destImage.height; ++y)
         {
-            auto const& toY = cfY[y];
+            const auto& toY = cfY[y];
 
             // Scanline 1
             if (toY.u0 != u0)
@@ -602,7 +602,7 @@ namespace
 
             for (size_t x = 0; x < destImage.width; ++x)
             {
-                auto const& toX = cfX[x];
+                const auto& toX = cfX[x];
 
                 XMVECTOR C0, C1, C2, C3;
 
@@ -811,7 +811,7 @@ namespace
 
         static_assert(TEX_FILTER_POINT == 0x100000, "TEX_FILTER_ flag values don't match TEX_FILTER_MASK");
 
-        unsigned long filter_select = filter & TEX_FILTER_MODE_MASK;
+        uint32_t filter_select = filter & TEX_FILTER_MODE_MASK;
         if (!filter_select)
         {
             // Default filter choice

DirectXTex/DirectXTexTGA.cpp

@@ -139,7 +139,7 @@ namespace
     // Decodes TGA header
     //-------------------------------------------------------------------------------------
     HRESULT DecodeTGAHeader(
-        _In_reads_bytes_(size) const void* pSource,
+        _In_reads_bytes_(size) const uint8_t* pSource,
         size_t size,
         TGA_FLAGS flags,
         _Out_ TexMetadata& metadata,
@@ -156,7 +156,7 @@ namespace
             return HRESULT_E_INVALID_DATA;
         }
 
-        auto pHeader = static_cast<const TGA_HEADER*>(pSource);
+        auto pHeader = reinterpret_cast<const TGA_HEADER*>(pSource);
 
         if (pHeader->bDescriptor & (TGA_FLAGS_INTERLEAVED_2WAY | TGA_FLAGS_INTERLEAVED_4WAY))
         {
@@ -1344,6 +1344,7 @@ namespace
 
         switch (metadata.GetAlphaMode())
         {
+        default:
         case TEX_ALPHA_MODE_UNKNOWN:
             ext->bAttributesType = HasAlpha(metadata.format) ? TGA_ATTRIBUTE_UNDEFINED : TGA_ATTRIBUTE_NONE;
             break;
@@ -1399,6 +1400,7 @@ namespace
             case TGA_ATTRIBUTE_UNDEFINED: return TEX_ALPHA_MODE_CUSTOM;
             case TGA_ATTRIBUTE_ALPHA: return TEX_ALPHA_MODE_STRAIGHT;
             case TGA_ATTRIBUTE_PREMULTIPLIED: return TEX_ALPHA_MODE_PREMULTIPLIED;
+            default: return TEX_ALPHA_MODE_UNKNOWN;
             }
         }
 
@@ -1411,7 +1413,7 @@ namespace
 
         if (ext && ext->wSize == sizeof(TGA_EXTENSION) && ext->wGammaDenominator != 0)
         {
-            auto const gamma = static_cast<float>(ext->wGammaNumerator) / static_cast<float>(ext->wGammaDenominator);
+            const auto gamma = static_cast<float>(ext->wGammaNumerator) / static_cast<float>(ext->wGammaDenominator);
             if (fabsf(gamma - 2.2f) < GAMMA_EPSILON || fabsf(gamma - 2.4f) < GAMMA_EPSILON)
             {
                 sRGB = true;
@@ -1445,7 +1447,7 @@ namespace
 //-------------------------------------------------------------------------------------
 _Use_decl_annotations_
 HRESULT DirectX::GetMetadataFromTGAMemory(
-    const void* pSource,
+    const uint8_t* pSource,
     size_t size,
     TGA_FLAGS flags,
     TexMetadata& metadata) noexcept
@@ -1490,12 +1492,10 @@ HRESULT DirectX::GetMetadataFromTGAFile(const wchar_t* szFile, TGA_FLAGS flags,
         return E_INVALIDARG;
 
 #ifdef _WIN32
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-    ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
-        FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
-#endif
+    ScopedHandle hFile(safe_handle(CreateFile2(
+        szFile,
+        GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
+        nullptr)));
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -1550,7 +1550,7 @@ HRESULT DirectX::GetMetadataFromTGAFile(const wchar_t* szFile, TGA_FLAGS flags,
         return HRESULT_FROM_WIN32(GetLastError());
     }
 
-    auto const headerLen = static_cast<size_t>(bytesRead);
+    const auto headerLen = static_cast<size_t>(bytesRead);
 #else
     inFile.read(reinterpret_cast<char*>(header), TGA_HEADER_LEN);
     if (!inFile)
@@ -1639,7 +1639,7 @@ HRESULT DirectX::GetMetadataFromTGAFile(const wchar_t* szFile, TGA_FLAGS flags,
 //-------------------------------------------------------------------------------------
 _Use_decl_annotations_
 HRESULT DirectX::LoadFromTGAMemory(
-    const void* pSource,
+    const uint8_t* pSource,
     size_t size,
     TGA_FLAGS flags,
     TexMetadata* metadata,
@@ -1679,11 +1679,11 @@ HRESULT DirectX::LoadFromTGAMemory(
 
     const size_t remaining = size - offset - paletteOffset;
     if (remaining == 0)
-        return E_FAIL;
+        return HRESULT_E_HANDLE_EOF;
 
     const void* pPixels = static_cast<const uint8_t*>(pSource) + offset + paletteOffset;
 
-    hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1);
+    hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1, CP_FLAGS_LIMIT_4GB);
     if (FAILED(hr))
         return hr;
 
@@ -1756,12 +1756,10 @@ HRESULT DirectX::LoadFromTGAFile(
     image.Release();
 
 #ifdef _WIN32
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-    ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
-        FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
-#endif
+    ScopedHandle hFile(safe_handle(CreateFile2(
+        szFile,
+        GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
+        nullptr)));
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -1816,7 +1814,7 @@ HRESULT DirectX::LoadFromTGAFile(
         return HRESULT_FROM_WIN32(GetLastError());
     }
 
-    auto const headerLen = static_cast<size_t>(bytesRead);
+    const auto headerLen = static_cast<size_t>(bytesRead);
 #else
     inFile.read(reinterpret_cast<char*>(header), TGA_HEADER_LEN);
     if (!inFile)
@@ -1836,7 +1834,7 @@ HRESULT DirectX::LoadFromTGAFile(
         return HRESULT_E_INVALID_DATA;
 
     // Read the pixels
-    auto const remaining = len - offset;
+    const auto remaining = len - offset;
     if (remaining == 0)
         return E_FAIL;
 
@@ -1856,7 +1854,7 @@ HRESULT DirectX::LoadFromTGAFile(
     #endif
     }
 
-    hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1);
+    hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1, CP_FLAGS_LIMIT_4GB);
     if (FAILED(hr))
         return hr;
 
@@ -2129,6 +2127,12 @@ HRESULT DirectX::LoadFromTGAFile(
                 image.Release();
                 return hr;
             }
+
+            if ((remaining - paletteOffset) == 0)
+            {
+                image.Release();
+                return HRESULT_E_HANDLE_EOF;
+            }
         }
 
         if (convFlags & CONV_FLAGS_RLE)
@@ -2277,7 +2281,7 @@ HRESULT DirectX::SaveToTGAMemory(
         return hr;
 
     // Copy header
-    auto destPtr = static_cast<uint8_t*>(blob.GetBufferPointer());
+    auto destPtr = blob.GetBufferPointer();
     assert(destPtr  != nullptr);
 
     uint8_t* dPtr = destPtr;
@@ -2355,13 +2359,10 @@ HRESULT DirectX::SaveToTGAFile(
 
     // Create file and write header
 #ifdef _WIN32
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-    ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_WRITE, 0,
-        CREATE_ALWAYS, nullptr)));
-#else
-    ScopedHandle hFile(safe_handle(CreateFileW(szFile,
-        GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr)));
-#endif
+    ScopedHandle hFile(safe_handle(CreateFile2(
+        szFile,
+        GENERIC_WRITE, 0, CREATE_ALWAYS,
+        nullptr)));
     if (!hFile)
     {
         return HRESULT_FROM_WIN32(GetLastError());
@@ -2394,7 +2395,7 @@ HRESULT DirectX::SaveToTGAFile(
     #ifdef _WIN32
         const DWORD bytesToWrite = static_cast<DWORD>(blob.GetBufferSize());
         DWORD bytesWritten;
-        if (!WriteFile(hFile.get(), blob.GetBufferPointer(), bytesToWrite, &bytesWritten, nullptr))
+        if (!WriteFile(hFile.get(), blob.GetConstBufferPointer(), bytesToWrite, &bytesWritten, nullptr))
         {
             return HRESULT_FROM_WIN32(GetLastError());
         }
@@ -2404,7 +2405,7 @@ HRESULT DirectX::SaveToTGAFile(
             return E_FAIL;
         }
     #else
-        outFile.write(reinterpret_cast<char*>(blob.GetBufferPointer()),
+        outFile.write(reinterpret_cast<const char*>(blob.GetConstBufferPointer()),
             static_cast<std::streamsize>(blob.GetBufferSize()));
 
         if (!outFile)

DirectXTex/DirectXTexUtil.cpp

@@ -27,6 +27,10 @@ static_assert(WIN10_DXGI_FORMAT_V208 == DXGI_FORMAT_V208, "Windows SDK mismatch
 static_assert(WIN10_DXGI_FORMAT_V408 == DXGI_FORMAT_V408, "Windows SDK mismatch detected");
 #endif
 
+#if defined(NTDDI_WIN11_GE) && !defined(_GAMING_XBOX)
+static_assert(WIN11_DXGI_FORMAT_A4B4G4R4_UNORM == DXGI_FORMAT_A4B4G4R4_UNORM, "Windows SDK mismatch detected");
+#endif
+
 using namespace DirectX;
 using Microsoft::WRL::ComPtr;
 
@@ -41,6 +45,12 @@ namespace
         const GUID& wic;
         DXGI_FORMAT format;
         bool        srgb;
+
+        constexpr WICTranslate(const GUID& wg, DXGI_FORMAT fmt, bool isrgb) noexcept :
+            wic(wg),
+            format(fmt),
+            srgb(isrgb)
+        {}
     };
 
     constexpr WICTranslate g_WICFormats[] =
@@ -75,7 +85,6 @@ namespace
 
     BOOL WINAPI InitializeWICFactory(PINIT_ONCE, PVOID, PVOID *ifactory) noexcept
     {
-    #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
         HRESULT hr = CoCreateInstance(
             CLSID_WICImagingFactory2,
             nullptr,
@@ -103,16 +112,6 @@ namespace
             );
             return SUCCEEDED(hr) ? TRUE : FALSE;
         }
-    #else
-        g_WIC2 = false;
-
-        return SUCCEEDED(CoCreateInstance(
-            CLSID_WICImagingFactory,
-            nullptr,
-            CLSCTX_INPROC_SERVER,
-            __uuidof(IWICImagingFactory),
-            ifactory)) ? TRUE : FALSE;
-    #endif
     }
 
 #else // !WIN32
@@ -141,13 +140,11 @@ DXGI_FORMAT DirectX::Internal::WICToDXGI(const GUID& guid) noexcept
             return g_WICFormats[i].format;
     }
 
-#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
     if (g_WIC2)
     {
         if (memcmp(&GUID_WICPixelFormat96bppRGBFloat, &guid, sizeof(GUID)) == 0)
             return DXGI_FORMAT_R32G32B32_FLOAT;
     }
-#endif
 
     return DXGI_FORMAT_UNKNOWN;
 }
@@ -187,7 +184,6 @@ bool DirectX::Internal::DXGIToWIC(DXGI_FORMAT format, GUID& guid, bool ignoreRGB
         memcpy(&guid, &GUID_WICPixelFormat32bppBGR, sizeof(GUID));
         return true;
 
-    #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
     case DXGI_FORMAT_R32G32B32_FLOAT:
         if (g_WIC2)
         {
@@ -195,7 +191,6 @@ bool DirectX::Internal::DXGIToWIC(DXGI_FORMAT format, GUID& guid, bool ignoreRGB
             return true;
         }
         break;
-    #endif
 
     default:
         for (size_t i = 0; i < std::size(g_WICFormats); ++i)
@@ -270,11 +265,11 @@ REFGUID DirectX::GetWICCodec(WICCodecs codec) noexcept
     case WIC_CODEC_ICO:
         return GUID_ContainerFormatIco;
 
-#ifdef NTDDI_WIN10_RS4
+    #ifdef NTDDI_WIN10_RS4
     case WIC_CODEC_HEIF:
         // This requires installing https://aka.ms/heif
         return GUID_ContainerFormatHeif;
-#endif
+    #endif
 
     default:
         return GUID_NULL;
@@ -319,14 +314,12 @@ void DirectX::SetWICFactory(_In_opt_ IWICImagingFactory* pWIC) noexcept
     bool iswic2 = false;
     if (pWIC)
     {
-    #if(_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
         ComPtr<IWICImagingFactory2> wic2;
         HRESULT hr = pWIC->QueryInterface(IID_PPV_ARGS(wic2.GetAddressOf()));
         if (SUCCEEDED(hr))
         {
             iswic2 = true;
         }
-    #endif
         pWIC->AddRef();
     }
 
@@ -400,10 +393,20 @@ bool DirectX::IsVideo(DXGI_FORMAT fmt) noexcept
 
 //-------------------------------------------------------------------------------------
 _Use_decl_annotations_
-bool DirectX::IsPlanar(DXGI_FORMAT fmt) noexcept
+bool DirectX::IsPlanar(DXGI_FORMAT fmt, bool isd3d12) noexcept
 {
     switch (static_cast<int>(fmt))
     {
+    case DXGI_FORMAT_R32G8X24_TYPELESS:
+    case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
+    case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
+    case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
+    case DXGI_FORMAT_R24G8_TYPELESS:
+    case DXGI_FORMAT_D24_UNORM_S8_UINT:
+    case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
+    case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
+        return isd3d12; // Direct3D 12 considers these planar, Direct3D 11 does not.
+
     case DXGI_FORMAT_NV12:      // 4:2:0 8-bit
     case DXGI_FORMAT_P010:      // 4:2:0 10-bit
     case DXGI_FORMAT_P016:      // 4:2:0 16-bit
@@ -911,6 +914,45 @@ size_t DirectX::BitsPerColor(DXGI_FORMAT fmt) noexcept
 }
 
 
+//-------------------------------------------------------------------------------------
+// Returns bytes per block for a given DXGI BC format, or 0 on failure
+//-------------------------------------------------------------------------------------
+_Use_decl_annotations_
+size_t DirectX::BytesPerBlock(DXGI_FORMAT fmt) noexcept
+{
+    switch (fmt)
+    {
+    case DXGI_FORMAT_BC1_TYPELESS:
+    case DXGI_FORMAT_BC1_UNORM:
+    case DXGI_FORMAT_BC1_UNORM_SRGB:
+    case DXGI_FORMAT_BC4_TYPELESS:
+    case DXGI_FORMAT_BC4_UNORM:
+    case DXGI_FORMAT_BC4_SNORM:
+        return 8;
+
+    case DXGI_FORMAT_BC2_TYPELESS:
+    case DXGI_FORMAT_BC2_UNORM:
+    case DXGI_FORMAT_BC2_UNORM_SRGB:
+    case DXGI_FORMAT_BC3_TYPELESS:
+    case DXGI_FORMAT_BC3_UNORM:
+    case DXGI_FORMAT_BC3_UNORM_SRGB:
+    case DXGI_FORMAT_BC5_TYPELESS:
+    case DXGI_FORMAT_BC5_UNORM:
+    case DXGI_FORMAT_BC5_SNORM:
+    case DXGI_FORMAT_BC6H_TYPELESS:
+    case DXGI_FORMAT_BC6H_UF16:
+    case DXGI_FORMAT_BC6H_SF16:
+    case DXGI_FORMAT_BC7_TYPELESS:
+    case DXGI_FORMAT_BC7_UNORM:
+    case DXGI_FORMAT_BC7_UNORM_SRGB:
+        return 16;
+
+    default:
+        return 0;
+    }
+}
+
+
 //-------------------------------------------------------------------------------------
 // Computes the image row pitch in bytes, and the slice ptich (size in bytes of the image)
 // based on DXGI format, width, and height
@@ -924,6 +966,9 @@ HRESULT DirectX::ComputePitch(DXGI_FORMAT fmt, size_t width, size_t height,
 
     switch (static_cast<int>(fmt))
     {
+    case DXGI_FORMAT_UNKNOWN:
+        return E_INVALIDARG;
+
     case DXGI_FORMAT_BC1_TYPELESS:
     case DXGI_FORMAT_BC1_UNORM:
     case DXGI_FORMAT_BC1_UNORM_SRGB:
@@ -1144,6 +1189,9 @@ size_t DirectX::ComputeScanlines(DXGI_FORMAT fmt, size_t height) noexcept
 {
     switch (static_cast<int>(fmt))
     {
+    case DXGI_FORMAT_UNKNOWN:
+        return 0;
+
     case DXGI_FORMAT_BC1_TYPELESS:
     case DXGI_FORMAT_BC1_UNORM:
     case DXGI_FORMAT_BC1_UNORM_SRGB:
@@ -1199,6 +1247,163 @@ size_t DirectX::ComputeScanlines(DXGI_FORMAT fmt, size_t height) noexcept
 }
 
 
+//-------------------------------------------------------------------------------------
+// Compute standard tile shape for 64KB tiles
+//-------------------------------------------------------------------------------------
+namespace
+{
+    constexpr size_t TILED_RESOURCE_TILE_SIZE_IN_BYTES = 65536;
+}
+
+_Use_decl_annotations_
+HRESULT DirectX::ComputeTileShape(
+    DXGI_FORMAT fmt,
+    TEX_DIMENSION dimension,
+    TileShape& tiling) noexcept
+{
+    tiling = {};
+
+    if (IsVideo(fmt) || IsPacked(fmt))
+        return E_INVALIDARG;
+
+    const size_t bpp = BitsPerPixel(fmt);
+    if (!bpp || bpp == 1 || bpp == 24 || bpp == 96)
+        return E_INVALIDARG;
+
+    const bool iscompressed = IsCompressed(fmt);
+
+    switch (dimension)
+    {
+    case TEX_DIMENSION_TEXTURE1D:
+        if (iscompressed)
+            return E_INVALIDARG;
+
+        tiling.width = (bpp) ? ((TILED_RESOURCE_TILE_SIZE_IN_BYTES * 8) / bpp) : TILED_RESOURCE_TILE_SIZE_IN_BYTES;
+        tiling.height = tiling.depth = 1;
+        break;
+
+    case TEX_DIMENSION_TEXTURE2D:
+        tiling.depth = 1;
+        if (iscompressed)
+        {
+            size_t bpb = BytesPerBlock(fmt);
+            switch (bpb)
+            {
+            case 8:
+                tiling.width = 128 * 4;
+                tiling.height = 64 * 4;
+                break;
+
+            case 16:
+                tiling.width = tiling.height = 64 * 4;
+                break;
+
+            default:
+                return E_INVALIDARG;
+            }
+
+            assert(((tiling.width / 4) * (tiling.height / 4) * bpb) == TILED_RESOURCE_TILE_SIZE_IN_BYTES);
+        }
+        else
+        {
+            if (bpp <= 8)
+            {
+                tiling.width = tiling.height = 256;
+            }
+            else if (bpp <= 16)
+            {
+                tiling.width = 256;
+                tiling.height = 128;
+            }
+            else if (bpp <= 32)
+            {
+                tiling.width = tiling.height = 128;
+            }
+            else if (bpp <= 64)
+            {
+                tiling.width = 128;
+                tiling.height = 64;
+            }
+            else if (bpp <= 128)
+            {
+                tiling.width = tiling.height = 64;
+            }
+            else
+            {
+                tiling = {};
+                return E_INVALIDARG;
+            }
+
+            assert(((tiling.width * tiling.height * bpp) / 8) == TILED_RESOURCE_TILE_SIZE_IN_BYTES);
+        }
+        break;
+
+    case TEX_DIMENSION_TEXTURE3D:
+        if (iscompressed)
+        {
+            size_t bpb = BytesPerBlock(fmt);
+            switch (bpb)
+            {
+            case 8:
+                tiling.width = 32 * 4;
+                tiling.height = 16 * 4;
+                tiling.depth = 16;
+                break;
+
+            case 16:
+                tiling.width = tiling.height = 16 * 4;
+                tiling.depth = 16;
+                break;
+
+            default:
+                return E_INVALIDARG;
+            }
+
+            assert(((tiling.width / 4) * (tiling.height / 4) * tiling.depth * bpb) == TILED_RESOURCE_TILE_SIZE_IN_BYTES);
+        }
+        else
+        {
+            if (bpp <= 8)
+            {
+                tiling.width = 64;
+                tiling.height = tiling.depth = 32;
+            }
+            else if (bpp <= 16)
+            {
+                tiling.width = tiling.height = tiling.depth = 32;
+            }
+            else if (bpp <= 32)
+            {
+                tiling.width = tiling.height = 32;
+                tiling.depth = 16;
+            }
+            else if (bpp <= 64)
+            {
+                tiling.width = 32;
+                tiling.height = tiling.depth = 16;
+            }
+            else if (bpp <= 128)
+            {
+                tiling.width = tiling.height = tiling.depth = 16;
+            }
+            else
+            {
+                tiling = {};
+                return E_INVALIDARG;
+            }
+
+            assert(((tiling.width * tiling.height * tiling.depth * bpp) / 8) == TILED_RESOURCE_TILE_SIZE_IN_BYTES);
+        }
+        break;
+
+    default:
+        return E_INVALIDARG;
+    }
+
+    return S_OK;
+}
+
+
 //-------------------------------------------------------------------------------------
 // Converts to an SRGB equivalent type if available
 //-------------------------------------------------------------------------------------
@@ -1487,7 +1692,6 @@ DXGI_FORMAT DirectX::MakeTypelessFLOAT(DXGI_FORMAT fmt) noexcept
 // TexMetadata
 //=====================================================================================
 
-_Use_decl_annotations_
 size_t TexMetadata::ComputeIndex(size_t mip, size_t item, size_t slice) const noexcept
 {
     if (mip >= mipLevels)
@@ -1536,6 +1740,72 @@ size_t TexMetadata::ComputeIndex(size_t mip, size_t item, size_t slice) const no
     }
 }
 
+// Equivalent to D3D11CacluateSubresource: MipSlice + ArraySlice * MipLevels
+uint32_t TexMetadata::CalculateSubresource(size_t mip, size_t item) const noexcept
+{
+    uint32_t result = uint32_t(-1);
+
+    if (mip < mipLevels)
+    {
+        switch (dimension)
+        {
+        case TEX_DIMENSION_TEXTURE1D:
+        case TEX_DIMENSION_TEXTURE2D:
+            if (item < arraySize)
+            {
+                return static_cast<uint32_t>(mip + item*mipLevels);
+            }
+            break;
+
+        case TEX_DIMENSION_TEXTURE3D:
+            // No support for arrays of volumes
+            if (item == 0)
+            {
+                result = static_cast<uint32_t>(mip);
+            }
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    return result;
+}
+
+// Equivalent to D3D12CacluateSubresource: MipSlice + ArraySlice * MipLevels + PlaneSlice * MipLevels * ArraySize
+uint32_t TexMetadata::CalculateSubresource(size_t mip, size_t item, size_t plane) const noexcept
+{
+    uint32_t result = uint32_t(-1);
+
+    if (mip < mipLevels)
+    {
+        switch (dimension)
+        {
+        case TEX_DIMENSION_TEXTURE1D:
+        case TEX_DIMENSION_TEXTURE2D:
+            if (item < arraySize)
+            {
+                return static_cast<uint32_t>(mip + item*mipLevels + plane*mipLevels*arraySize);
+            }
+            break;
+
+        case TEX_DIMENSION_TEXTURE3D:
+            // No support for arrays of volumes
+            if (item == 0)
+            {
+                result = static_cast<uint32_t>(mip + plane*mipLevels);
+            }
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    return result;
+}
+
 
 //=====================================================================================
 // Blob - Bitmap image container
@@ -1575,7 +1845,7 @@ HRESULT Blob::Initialize(size_t size) noexcept
 
     Release();
 
-    m_buffer = _aligned_malloc(size, 16);
+    m_buffer = reinterpret_cast<uint8_t*>(_aligned_malloc(size, 16));
     if (!m_buffer)
     {
         Release();
@@ -1611,7 +1881,7 @@ HRESULT Blob::Resize(size_t size) noexcept
     if (!m_buffer || !m_size)
         return E_UNEXPECTED;
 
-    void *tbuffer = _aligned_malloc(size, 16);
+    auto tbuffer = reinterpret_cast<uint8_t*>(_aligned_malloc(size, 16));
     if (!tbuffer)
         return E_OUTOFMEMORY;
 

DirectXTex/DirectXTexWIC.cpp

@@ -25,6 +25,12 @@ namespace
         const GUID&     source;
         const GUID&     target;
         TEX_ALPHA_MODE  alphaMode;
+
+        constexpr WICConvert(const GUID& src, const GUID& tgt, TEX_ALPHA_MODE mode) noexcept :
+            source(src),
+            target(tgt),
+            alphaMode(mode)
+        {}
     };
 
     constexpr WICConvert g_WICConvert[] =
@@ -76,11 +82,9 @@ namespace
         { GUID_WICPixelFormat40bppCMYKAlpha,        GUID_WICPixelFormat32bppRGBA, TEX_ALPHA_MODE_UNKNOWN }, // DXGI_FORMAT_R8G8B8A8_UNORM
         { GUID_WICPixelFormat80bppCMYKAlpha,        GUID_WICPixelFormat64bppRGBA, TEX_ALPHA_MODE_UNKNOWN }, // DXGI_FORMAT_R16G16B16A16_UNORM
 
-    #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
         { GUID_WICPixelFormat32bppRGB,              GUID_WICPixelFormat32bppRGBA, TEX_ALPHA_MODE_OPAQUE }, // DXGI_FORMAT_R8G8B8A8_UNORM
         { GUID_WICPixelFormat64bppRGB,              GUID_WICPixelFormat64bppRGBA, TEX_ALPHA_MODE_OPAQUE }, // DXGI_FORMAT_R16G16B16A16_UNORM
         { GUID_WICPixelFormat64bppPRGBAHalf,        GUID_WICPixelFormat64bppRGBAHalf, TEX_ALPHA_MODE_UNKNOWN }, // DXGI_FORMAT_R16G16B16A16_FLOAT
-    #endif
 
         // We don't support n-channel formats
     };
@@ -106,7 +110,6 @@ namespace
         {
             if (memcmp(&GUID_WICPixelFormat96bppRGBFixedPoint, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0)
             {
-            #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
                 if (iswic2)
                 {
                     if (pConvert)
@@ -114,9 +117,6 @@ namespace
                     format = DXGI_FORMAT_R32G32B32_FLOAT;
                 }
                 else
-                #else
-                UNREFERENCED_PARAMETER(iswic2);
-            #endif
                 {
                     if (pConvert)
                         memcpy_s(pConvert, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat128bppRGBAFloat, sizeof(GUID));
@@ -203,7 +203,7 @@ namespace
             m_streamEOF(0),
             mRefCount(1)
         {
-            assert(mBlob.GetBufferPointer() && mBlob.GetBufferSize() > 0);
+            assert(mBlob.GetConstBufferPointer() && mBlob.GetBufferSize() > 0);
         }
 
     public:
@@ -249,7 +249,7 @@ namespace
         HRESULT STDMETHODCALLTYPE Read(void* pv, ULONG cb, ULONG* pcbRead) override
         {
             size_t maxRead = m_streamEOF - m_streamPosition;
-            auto ptr = static_cast<const uint8_t*>(mBlob.GetBufferPointer());
+            auto ptr = mBlob.GetBufferPointer();
             if (cb > maxRead)
             {
                 const uint64_t pos = uint64_t(m_streamPosition) + uint64_t(maxRead);
@@ -319,7 +319,7 @@ namespace
             if (pos > UINT32_MAX)
                 return HRESULT_E_ARITHMETIC_OVERFLOW;
 
-            auto ptr = static_cast<uint8_t*>(mBlob.GetBufferPointer());
+            auto ptr = mBlob.GetBufferPointer();
             memcpy(&ptr[m_streamPosition], pv, cb);
 
             m_streamPosition = static_cast<size_t>(pos);
@@ -342,7 +342,7 @@ namespace
 
             if (blobSize >= size.LowPart)
             {
-                auto ptr = static_cast<uint8_t*>(mBlob.GetBufferPointer());
+                auto ptr = mBlob.GetBufferPointer();
                 if (m_streamEOF < size.LowPart)
                 {
                     memset(&ptr[m_streamEOF], 0, size.LowPart - m_streamEOF);
@@ -362,7 +362,7 @@ namespace
                 if (FAILED(hr))
                     return hr;
 
-                auto ptr = static_cast<uint8_t*>(mBlob.GetBufferPointer());
+                auto ptr = mBlob.GetBufferPointer();
                 if (m_streamEOF < size.LowPart)
                 {
                     memset(&ptr[m_streamEOF], 0, size.LowPart - m_streamEOF);
@@ -1216,7 +1216,7 @@ namespace
 //-------------------------------------------------------------------------------------
 _Use_decl_annotations_
 HRESULT DirectX::GetMetadataFromWICMemory(
-    const void* pSource,
+    const uint8_t* pSource,
     size_t size,
     WIC_FLAGS flags,
     TexMetadata& metadata,
@@ -1239,7 +1239,7 @@ HRESULT DirectX::GetMetadataFromWICMemory(
     if (FAILED(hr))
         return hr;
 
-    hr = stream->InitializeFromMemory(static_cast<BYTE*>(const_cast<void*>(pSource)),
+    hr = stream->InitializeFromMemory(static_cast<BYTE*>(const_cast<uint8_t*>(pSource)),
         static_cast<UINT>(size));
     if (FAILED(hr))
         return hr;
@@ -1307,7 +1307,7 @@ HRESULT DirectX::GetMetadataFromWICFile(
 //-------------------------------------------------------------------------------------
 _Use_decl_annotations_
 HRESULT DirectX::LoadFromWICMemory(
-    const void* pSource,
+    const uint8_t* pSource,
     size_t size,
     WIC_FLAGS flags,
     TexMetadata* metadata,
@@ -1333,7 +1333,7 @@ HRESULT DirectX::LoadFromWICMemory(
     if (FAILED(hr))
         return hr;
 
-    hr = stream->InitializeFromMemory(static_cast<uint8_t*>(const_cast<void*>(pSource)), static_cast<DWORD>(size));
+    hr = stream->InitializeFromMemory(static_cast<uint8_t*>(const_cast<uint8_t*>(pSource)), static_cast<DWORD>(size));
     if (FAILED(hr))
         return hr;
 

DirectXTex/DirectXTex_Desktop_2019.vcxproj

@@ -138,10 +138,10 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
@@ -165,10 +165,10 @@
       <OpenMPSupport>true</OpenMPSupport>
       <FloatingPointModel>Fast</FloatingPointModel>
       <AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
@@ -192,10 +192,10 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
@@ -218,10 +218,10 @@
       <OpenMPSupport>true</OpenMPSupport>
       <FloatingPointModel>Fast</FloatingPointModel>
       <AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
@@ -246,10 +246,10 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
@@ -272,10 +272,10 @@
       <OpenMPSupport>true</OpenMPSupport>
       <FloatingPointModel>Fast</FloatingPointModel>
       <AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
@@ -347,10 +347,13 @@
       <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
       <_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
       <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\</_ATGFXCPath>
+      <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`))</_ATGFXCVer>
+      <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\</_ATGFXCVer>
     </PropertyGroup>
-    <Exec Condition="!Exists('Shaders/Compiled/BC6HEncode_EncodeBlockCS.inc')" WorkingDirectory="$(ProjectDir)Shaders" Command="CompileShaders" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath)" />
+    <Exec Condition="!Exists('Shaders/Compiled/BC6HEncode_EncodeBlockCS.inc')" WorkingDirectory="$(ProjectDir)Shaders" Command="CompileShaders" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath);WindowsSDKVersion=$(_ATGFXCVer);CompileShadersOutput=$(ProjectDir)Shaders/Compiled" LogStandardErrorAsError="true" />
     <PropertyGroup>
       <_ATGFXCPath />
+      <_ATGFXCVer />
     </PropertyGroup>
   </Target>
   <Target Name="ATGDeleteShaders" AfterTargets="Clean">