mirror of
https://github.com/microsoft/DirectXTex.git
synced 2025-07-10 20:20:13 +02:00
Compare commits
No commits in common. "main" and "jun2023" have entirely different histories.
@ -1,370 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,397 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,229 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,321 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,154 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,359 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,138 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,354 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,157 +0,0 @@
|
|||||||
# 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'
|
|
||||||
@ -1,157 +0,0 @@
|
|||||||
# 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'
|
|
||||||
@ -1,300 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,187 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,171 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,267 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,267 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,97 +0,0 @@
|
|||||||
# 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)'
|
|
||||||
@ -1,92 +0,0 @@
|
|||||||
# 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'
|
|
||||||
@ -1,152 +0,0 @@
|
|||||||
# 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)
|
|
||||||
@ -1,201 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
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
|
|
||||||
@ -1,120 +0,0 @@
|
|||||||
# 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)
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,13 +1,5 @@
|
|||||||
root = true
|
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}]
|
[*.{fx,fxh,hlsl,hlsli}]
|
||||||
indent_size = 4
|
indent_size = 4
|
||||||
indent_style = space
|
indent_style = space
|
||||||
|
|||||||
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -14,7 +14,6 @@
|
|||||||
*.vcxproj eol=crlf
|
*.vcxproj eol=crlf
|
||||||
*.filters eol=crlf
|
*.filters eol=crlf
|
||||||
*.sln eol=crlf
|
*.sln eol=crlf
|
||||||
*.yml eol=crlf
|
|
||||||
|
|
||||||
# Explicitly declare resource files as binary
|
# Explicitly declare resource files as binary
|
||||||
*.pdb binary
|
*.pdb binary
|
||||||
|
|||||||
6
.github/dependabot.yml
vendored
6
.github/dependabot.yml
vendored
@ -1,6 +0,0 @@
|
|||||||
version: 2
|
|
||||||
updates:
|
|
||||||
- package-ecosystem: github-actions
|
|
||||||
directory: /
|
|
||||||
schedule:
|
|
||||||
interval: monthly
|
|
||||||
9
.github/linters/.editorconfig-checker.json
vendored
9
.github/linters/.editorconfig-checker.json
vendored
@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"Format": "github-actions",
|
|
||||||
"exclude": [
|
|
||||||
".git",
|
|
||||||
"LICENSE",
|
|
||||||
"Tests",
|
|
||||||
"Common/d3dx12.h"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
20
.github/linters/.markdown-lint.yml
vendored
20
.github/linters/.markdown-lint.yml
vendored
@ -1,20 +0,0 @@
|
|||||||
# 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
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
# PSScriptAnalyzerSettings.psd1
|
|
||||||
@{
|
|
||||||
Severity=@('Error','Warning')
|
|
||||||
ExcludeRules=@('PSAvoidUsingWriteHost')
|
|
||||||
}
|
|
||||||
17
.github/linters/.yaml-lint.yml
vendored
17
.github/linters/.yaml-lint.yml
vendored
@ -1,17 +0,0 @@
|
|||||||
# 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
|
|
||||||
133
.github/workflows/bvt.yml
vendored
133
.github/workflows/bvt.yml
vendored
@ -1,133 +0,0 @@
|
|||||||
# 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
|
|
||||||
78
.github/workflows/codeql.yml
vendored
78
.github/workflows/codeql.yml
vendored
@ -1,78 +0,0 @@
|
|||||||
# 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"
|
|
||||||
46
.github/workflows/lint.yml
vendored
46
.github/workflows/lint.yml
vendored
@ -1,46 +0,0 @@
|
|||||||
# 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
|
|
||||||
144
.github/workflows/main.yml
vendored
144
.github/workflows/main.yml
vendored
@ -1,144 +0,0 @@
|
|||||||
# 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 }}
|
|
||||||
84
.github/workflows/msbuild.yml
vendored
84
.github/workflows/msbuild.yml
vendored
@ -1,84 +0,0 @@
|
|||||||
# 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
|
|
||||||
88
.github/workflows/msvc.yml
vendored
88
.github/workflows/msvc.yml
vendored
@ -1,88 +0,0 @@
|
|||||||
# 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 }}
|
|
||||||
188
.github/workflows/test.yml
vendored
188
.github/workflows/test.yml
vendored
@ -1,188 +0,0 @@
|
|||||||
# 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 }}
|
|
||||||
96
.github/workflows/uwp.yml
vendored
96
.github/workflows/uwp.yml
vendored
@ -1,96 +0,0 @@
|
|||||||
# 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 }}
|
|
||||||
161
.github/workflows/vcpkg.yml
vendored
161
.github/workflows/vcpkg.yml
vendored
@ -1,161 +0,0 @@
|
|||||||
# 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 }}
|
|
||||||
110
.github/workflows/wsl.yml
vendored
110
.github/workflows/wsl.yml
vendored
@ -1,110 +0,0 @@
|
|||||||
# 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 }}
|
|
||||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -34,8 +34,6 @@ Profile
|
|||||||
Release
|
Release
|
||||||
x64
|
x64
|
||||||
/Tests
|
/Tests
|
||||||
/Testing
|
|
||||||
/wiki
|
/wiki
|
||||||
/out
|
/out
|
||||||
/CMakeUserPresets.json
|
/CMakeUserPresets.json
|
||||||
/build/vcpkg_installed
|
|
||||||
|
|||||||
@ -7,10 +7,10 @@
|
|||||||
<authors>Microsoft</authors>
|
<authors>Microsoft</authors>
|
||||||
<owners>microsoft,directxtk</owners>
|
<owners>microsoft,directxtk</owners>
|
||||||
<summary>DirectXTex texture processing library</summary>
|
<summary>DirectXTex texture processing library</summary>
|
||||||
<description>This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022 on Windows 8.1 or later.
|
<description>This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022 and supports Windows 7 / DirectX 11.
|
||||||
|
|
||||||
DirectXTex, a shared source library for reading and writing .DDS files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and .HDR readers and writers since these image file format are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec.</description>
|
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 July 9, 2025 release on GitHub.</releaseNotes>
|
<releaseNotes>Matches the June 13, 2023 release on GitHub.</releaseNotes>
|
||||||
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248926</projectUrl>
|
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248926</projectUrl>
|
||||||
<repository type="git" url="https://github.com/microsoft/DirectXTex.git" />
|
<repository type="git" url="https://github.com/microsoft/DirectXTex.git" />
|
||||||
<icon>images\icon.jpg</icon>
|
<icon>images\icon.jpg</icon>
|
||||||
|
|||||||
@ -3,14 +3,14 @@
|
|||||||
<metadata minClientVersion="2.8.6">
|
<metadata minClientVersion="2.8.6">
|
||||||
<id>directxtex_desktop_win10</id>
|
<id>directxtex_desktop_win10</id>
|
||||||
<version>0.0.0-SpecifyVersionOnCommandline</version>
|
<version>0.0.0-SpecifyVersionOnCommandline</version>
|
||||||
<title>DirectXTex Library (VS 2022 Win32 for Windows 10/11)</title>
|
<title>DirectXTex Library (VS 2019/2022 Win32 for Windows 10/11)</title>
|
||||||
<authors>Microsoft</authors>
|
<authors>Microsoft</authors>
|
||||||
<owners>microsoft,directxtk</owners>
|
<owners>microsoft,directxtk</owners>
|
||||||
<summary>DirectXTex texture processing library</summary>
|
<summary>DirectXTex texture processing library</summary>
|
||||||
<description>This version is for Windows desktop applications using Visual Studio 2022 on Windows 10 / Windows 11 including both DirectX 11 and DirectX 12.
|
<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.
|
||||||
|
|
||||||
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>
|
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 July 9, 2025 release on GitHub.</releaseNotes>
|
<releaseNotes>Matches the June 13, 2023 release on GitHub.</releaseNotes>
|
||||||
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248926</projectUrl>
|
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248926</projectUrl>
|
||||||
<repository type="git" url="https://github.com/microsoft/DirectXTex.git" />
|
<repository type="git" url="https://github.com/microsoft/DirectXTex.git" />
|
||||||
<icon>images\icon.jpg</icon>
|
<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>
|
<license type="expression">MIT</license>
|
||||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||||
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
|
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
|
||||||
<tags>DirectX DirectXTex native nativepackage ARM64</tags>
|
<tags>DirectX DirectXTex native nativepackage</tags>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|
||||||
<files>
|
<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.h" />
|
||||||
<file target="include" src="DirectXTex\DirectXTex.inl" />
|
<file target="include" src="DirectXTex\DirectXTex.inl" />
|
||||||
|
|
||||||
<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_2019_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\Debug\*.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_2019_Win10\Win32\DebugSpectre\*.lib" />
|
||||||
<file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\Win32\DebugSpectre\*.pdb" />
|
<file target="native\lib\x86\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\DebugSpectre\*.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_2019_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\Release\*.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_2019_Win10\Win32\ReleaseSpectre\*.lib" />
|
||||||
<file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2022_Win10\Win32\ReleaseSpectre\*.pdb" />
|
<file target="native\lib\x86\Release" src="DirectXTex\Bin\Desktop_2019_Win10\Win32\ReleaseSpectre\*.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_2019_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\Debug\*.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_2019_Win10\x64\DebugSpectre\*.lib" />
|
||||||
<file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\x64\DebugSpectre\*.pdb" />
|
<file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\x64\DebugSpectre\*.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_2019_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\Release\*.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_2019_Win10\x64\ReleaseSpectre\*.lib" />
|
||||||
<file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2022_Win10\x64\ReleaseSpectre\*.pdb" />
|
<file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\x64\ReleaseSpectre\*.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_2019_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\Debug\*.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_2019_Win10\ARM64\DebugSpectre\*.lib" />
|
||||||
<file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2022_Win10\ARM64\DebugSpectre\*.pdb" />
|
<file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\DebugSpectre\*.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_2019_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\Release\*.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_2019_Win10\ARM64\ReleaseSpectre\*.lib" />
|
||||||
<file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2022_Win10\ARM64\ReleaseSpectre\*.pdb" />
|
<file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\ReleaseSpectre\*.pdb" />
|
||||||
|
|
||||||
<file src=".nuget/directxtex_desktop_win10.targets" target="build\native" />
|
<file src=".nuget/directxtex_desktop_win10.targets" target="build\native" />
|
||||||
|
|
||||||
|
|||||||
@ -7,10 +7,10 @@
|
|||||||
<authors>Microsoft</authors>
|
<authors>Microsoft</authors>
|
||||||
<owners>microsoft,directxtk</owners>
|
<owners>microsoft,directxtk</owners>
|
||||||
<summary>DirectXTex texture processing library</summary>
|
<summary>DirectXTex texture processing library</summary>
|
||||||
<description>This version is for Universal Windows Platform apps on Windows 10 / Windows 11 using Visual Studio 2022.
|
<description>This version is for Universal Windows Platform apps on Windows 10 / Windows 11 using Visual Studio 2019 (16.11) or Visual Studio 2022.
|
||||||
|
|
||||||
DirectXTex, a shared source library for reading and writing .DDS files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and .HDR readers and writers since these image file format are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec.</description>
|
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 July 9, 2025 release on GitHub.</releaseNotes>
|
<releaseNotes>Matches the June 13, 2023 release on GitHub.</releaseNotes>
|
||||||
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248926</projectUrl>
|
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248926</projectUrl>
|
||||||
<repository type="git" url="https://github.com/microsoft/DirectXTex.git" />
|
<repository type="git" url="https://github.com/microsoft/DirectXTex.git" />
|
||||||
<icon>images\icon.jpg</icon>
|
<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>
|
<license type="expression">MIT</license>
|
||||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||||
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
|
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
|
||||||
<tags>DirectX DirectXTex native nativepackage ARM64</tags>
|
<tags>DirectX DirectXTex native nativepackage</tags>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|
||||||
<files>
|
<files>
|
||||||
@ -28,23 +28,29 @@ 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.h" />
|
||||||
<file target="include" src="DirectXTex\DirectXTex.inl" />
|
<file target="include" src="DirectXTex\DirectXTex.inl" />
|
||||||
|
|
||||||
<file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Windows10_2022\ARM64\Debug\*.lib" />
|
<file target="native\lib\ARM\Debug" src="DirectXTex\Bin\Windows10_2019\ARM\Debug\*.lib" />
|
||||||
<file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Windows10_2022\ARM64\Debug\*.pdb" />
|
<file target="native\lib\ARM\Debug" src="DirectXTex\Bin\Windows10_2019\ARM\Debug\*.pdb" />
|
||||||
|
|
||||||
<file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Windows10_2022\ARM64\Release\*.lib" />
|
<file target="native\lib\ARM\Release" src="DirectXTex\Bin\Windows10_2019\ARM\Release\*.lib" />
|
||||||
<file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Windows10_2022\ARM64\Release\*.pdb" />
|
<file target="native\lib\ARM\Release" src="DirectXTex\Bin\Windows10_2019\ARM\Release\*.pdb" />
|
||||||
|
|
||||||
<file target="native\lib\x86\Debug" src="DirectXTex\Bin\Windows10_2022\Win32\Debug\*.lib" />
|
<file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Windows10_2019\ARM64\Debug\*.lib" />
|
||||||
<file target="native\lib\x86\Debug" src="DirectXTex\Bin\Windows10_2022\Win32\Debug\*.pdb" />
|
<file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Windows10_2019\ARM64\Debug\*.pdb" />
|
||||||
|
|
||||||
<file target="native\lib\x86\Release" src="DirectXTex\Bin\Windows10_2022\Win32\Release\*.lib" />
|
<file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Windows10_2019\ARM64\Release\*.lib" />
|
||||||
<file target="native\lib\x86\Release" src="DirectXTex\Bin\Windows10_2022\Win32\Release\*.pdb" />
|
<file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Windows10_2019\ARM64\Release\*.pdb" />
|
||||||
|
|
||||||
<file target="native\lib\x64\Debug" src="DirectXTex\Bin\Windows10_2022\x64\Debug\*.lib" />
|
<file target="native\lib\x86\Debug" src="DirectXTex\Bin\Windows10_2019\Win32\Debug\*.lib" />
|
||||||
<file target="native\lib\x64\Debug" src="DirectXTex\Bin\Windows10_2022\x64\Debug\*.pdb" />
|
<file target="native\lib\x86\Debug" src="DirectXTex\Bin\Windows10_2019\Win32\Debug\*.pdb" />
|
||||||
|
|
||||||
<file target="native\lib\x64\Release" src="DirectXTex\Bin\Windows10_2022\x64\Release\*.lib" />
|
<file target="native\lib\x86\Release" src="DirectXTex\Bin\Windows10_2019\Win32\Release\*.lib" />
|
||||||
<file target="native\lib\x64\Release" src="DirectXTex\Bin\Windows10_2022\x64\Release\*.pdb" />
|
<file target="native\lib\x86\Release" src="DirectXTex\Bin\Windows10_2019\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\Release" src="DirectXTex\Bin\Windows10_2019\x64\Release\*.lib" />
|
||||||
|
<file target="native\lib\x64\Release" src="DirectXTex\Bin\Windows10_2019\x64\Release\*.pdb" />
|
||||||
|
|
||||||
<file src=".nuget/directxtex_uwp.targets" target="build\native" />
|
<file src=".nuget/directxtex_uwp.targets" target="build\native" />
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
// File: DirectXTexEXR.cpp
|
// File: DirectXTexEXR.cpp
|
||||||
//
|
//
|
||||||
// DirectXTex Auxilary functions for using the OpenEXR library
|
// DirectXTex Auxillary functions for using the OpenEXR library
|
||||||
//
|
//
|
||||||
// Copyright (c) Microsoft Corporation.
|
// Copyright (c) Microsoft Corporation.
|
||||||
// Licensed under the MIT License.
|
// Licensed under the MIT License.
|
||||||
@ -22,7 +22,7 @@
|
|||||||
#include <tuple>
|
#include <tuple>
|
||||||
|
|
||||||
//
|
//
|
||||||
// Requires the OpenEXR library <http://www.openexr.com/> and its dependencies.
|
// Requires the OpenEXR library <http://www.openexr.com/> and ZLIB <http://www.zlib.net>
|
||||||
//
|
//
|
||||||
|
|
||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
@ -45,13 +45,8 @@
|
|||||||
#pragma warning(disable : 4244 4996)
|
#pragma warning(disable : 4244 4996)
|
||||||
#include <ImfRgbaFile.h>
|
#include <ImfRgbaFile.h>
|
||||||
#include <ImfIO.h>
|
#include <ImfIO.h>
|
||||||
|
|
||||||
// https://openexr.com/en/latest/PortingGuide.html
|
|
||||||
#include <OpenEXRConfig.h>
|
|
||||||
#pragma warning(pop)
|
#pragma warning(pop)
|
||||||
|
|
||||||
#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + (100*OPENEXR_VERSION_MINOR) + OPENEXR_VERSION_PATCH)
|
|
||||||
|
|
||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
#pragma clang diagnostic pop
|
#pragma clang diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
@ -153,13 +148,6 @@ namespace
|
|||||||
SetLastError(0);
|
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:
|
private:
|
||||||
HANDLE m_hFile;
|
HANDLE m_hFile;
|
||||||
LONGLONG m_EOF;
|
LONGLONG m_EOF;
|
||||||
@ -169,8 +157,7 @@ namespace
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
OutputStream(HANDLE hFile, const char fileName[]) :
|
OutputStream(HANDLE hFile, const char fileName[]) :
|
||||||
OStream(fileName), m_hFile(hFile)
|
OStream(fileName), m_hFile(hFile) {}
|
||||||
{}
|
|
||||||
|
|
||||||
OutputStream(const OutputStream&) = delete;
|
OutputStream(const OutputStream&) = delete;
|
||||||
OutputStream& operator = (const OutputStream&) = delete;
|
OutputStream& operator = (const OutputStream&) = delete;
|
||||||
@ -233,7 +220,7 @@ HRESULT DirectX::GetMetadataFromEXRFile(const wchar_t* szFile, TexMetadata& meta
|
|||||||
const int nameLength = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, nullptr, 0, nullptr, nullptr);
|
const int nameLength = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, nullptr, 0, nullptr, nullptr);
|
||||||
if (nameLength > 0)
|
if (nameLength > 0)
|
||||||
{
|
{
|
||||||
fileName.resize(static_cast<size_t>(nameLength));
|
fileName.resize(nameLength);
|
||||||
const int result = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, fileName.data(), nameLength, nullptr, nullptr);
|
const int result = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, fileName.data(), nameLength, nullptr, nullptr);
|
||||||
if (result <= 0)
|
if (result <= 0)
|
||||||
{
|
{
|
||||||
@ -241,10 +228,19 @@ HRESULT DirectX::GetMetadataFromEXRFile(const wchar_t* szFile, TexMetadata& meta
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
ScopedHandle hFile(safe_handle(CreateFile2(
|
||||||
szFile,
|
szFile,
|
||||||
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
||||||
nullptr)));
|
nullptr)));
|
||||||
|
#else
|
||||||
|
ScopedHandle hFile(safe_handle(CreateFileW(
|
||||||
|
szFile,
|
||||||
|
GENERIC_READ, FILE_SHARE_READ,
|
||||||
|
nullptr,
|
||||||
|
OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN,
|
||||||
|
nullptr)));
|
||||||
|
#endif
|
||||||
if (!hFile)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -269,25 +265,14 @@ HRESULT DirectX::GetMetadataFromEXRFile(const wchar_t* szFile, TexMetadata& meta
|
|||||||
const auto dw = file.dataWindow();
|
const auto dw = file.dataWindow();
|
||||||
|
|
||||||
const int width = dw.max.x - dw.min.x + 1;
|
const int width = dw.max.x - dw.min.x + 1;
|
||||||
int height = dw.max.y - dw.min.y + 1;
|
const int height = dw.max.y - dw.min.y + 1;
|
||||||
size_t arraySize = 1;
|
|
||||||
|
|
||||||
if (width < 1 || height < 1)
|
if (width < 1 || height < 1)
|
||||||
return E_FAIL;
|
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.width = static_cast<size_t>(width);
|
||||||
metadata.height = static_cast<size_t>(height);
|
metadata.height = static_cast<size_t>(height);
|
||||||
metadata.depth = metadata.mipLevels = 1;
|
metadata.depth = metadata.arraySize = metadata.mipLevels = 1;
|
||||||
metadata.arraySize = arraySize;
|
|
||||||
metadata.format = DXGI_FORMAT_R16G16B16A16_FLOAT;
|
metadata.format = DXGI_FORMAT_R16G16B16A16_FLOAT;
|
||||||
metadata.dimension = TEX_DIMENSION_TEXTURE2D;
|
metadata.dimension = TEX_DIMENSION_TEXTURE2D;
|
||||||
}
|
}
|
||||||
@ -342,7 +327,7 @@ HRESULT DirectX::LoadFromEXRFile(const wchar_t* szFile, TexMetadata* metadata, S
|
|||||||
const int nameLength = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, nullptr, 0, nullptr, nullptr);
|
const int nameLength = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, nullptr, 0, nullptr, nullptr);
|
||||||
if (nameLength > 0)
|
if (nameLength > 0)
|
||||||
{
|
{
|
||||||
fileName.resize(static_cast<size_t>(nameLength));
|
fileName.resize(nameLength);
|
||||||
const int result = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, fileName.data(), nameLength, nullptr, nullptr);
|
const int result = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, fileName.data(), nameLength, nullptr, nullptr);
|
||||||
if (result <= 0)
|
if (result <= 0)
|
||||||
{
|
{
|
||||||
@ -350,10 +335,19 @@ HRESULT DirectX::LoadFromEXRFile(const wchar_t* szFile, TexMetadata* metadata, S
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
ScopedHandle hFile(safe_handle(CreateFile2(
|
||||||
szFile,
|
szFile,
|
||||||
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
||||||
nullptr)));
|
nullptr)));
|
||||||
|
#else
|
||||||
|
ScopedHandle hFile(safe_handle(CreateFileW(
|
||||||
|
szFile,
|
||||||
|
GENERIC_READ, FILE_SHARE_READ,
|
||||||
|
nullptr,
|
||||||
|
OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN,
|
||||||
|
nullptr)));
|
||||||
|
#endif
|
||||||
if (!hFile)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -375,37 +369,25 @@ HRESULT DirectX::LoadFromEXRFile(const wchar_t* szFile, TexMetadata* metadata, S
|
|||||||
Imf::RgbaInputFile file(fileName.c_str());
|
Imf::RgbaInputFile file(fileName.c_str());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const auto dw = file.dataWindow();
|
auto const dw = file.dataWindow();
|
||||||
|
|
||||||
const int width = dw.max.x - dw.min.x + 1;
|
const int width = dw.max.x - dw.min.x + 1;
|
||||||
int height = dw.max.y - dw.min.y + 1;
|
const int height = dw.max.y - dw.min.y + 1;
|
||||||
size_t arraySize = 1;
|
|
||||||
|
|
||||||
if (width < 1 || height < 1)
|
if (width < 1 || height < 1)
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
||||||
if (file.header().find("envmap") != file.header().end())
|
|
||||||
{
|
|
||||||
if (width == height / 6)
|
|
||||||
{
|
|
||||||
height = width;
|
|
||||||
arraySize = 6;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (metadata)
|
if (metadata)
|
||||||
{
|
{
|
||||||
metadata->width = static_cast<size_t>(width);
|
metadata->width = static_cast<size_t>(width);
|
||||||
metadata->height = static_cast<size_t>(height);
|
metadata->height = static_cast<size_t>(height);
|
||||||
metadata->depth = metadata->mipLevels = 1;
|
metadata->depth = metadata->arraySize = metadata->mipLevels = 1;
|
||||||
metadata->arraySize = arraySize;
|
|
||||||
metadata->format = DXGI_FORMAT_R16G16B16A16_FLOAT;
|
metadata->format = DXGI_FORMAT_R16G16B16A16_FLOAT;
|
||||||
metadata->dimension = TEX_DIMENSION_TEXTURE2D;
|
metadata->dimension = TEX_DIMENSION_TEXTURE2D;
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = image.Initialize2D(DXGI_FORMAT_R16G16B16A16_FLOAT,
|
hr = image.Initialize2D(DXGI_FORMAT_R16G16B16A16_FLOAT,
|
||||||
static_cast<size_t>(width), static_cast<size_t>(height), arraySize, 1u);
|
static_cast<size_t>(width), static_cast<size_t>(height), 1u, 1u);
|
||||||
|
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
@ -482,7 +464,7 @@ HRESULT DirectX::SaveToEXRFile(const Image& image, const wchar_t* szFile)
|
|||||||
const int nameLength = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, nullptr, 0, nullptr, nullptr);
|
const int nameLength = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, nullptr, 0, nullptr, nullptr);
|
||||||
if (nameLength > 0)
|
if (nameLength > 0)
|
||||||
{
|
{
|
||||||
fileName.resize(static_cast<size_t>(nameLength));
|
fileName.resize(nameLength);
|
||||||
const int result = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, fileName.data(), nameLength, nullptr, nullptr);
|
const int result = WideCharToMultiByte(CP_UTF8, 0, szFile, -1, fileName.data(), nameLength, nullptr, nullptr);
|
||||||
if (result <= 0)
|
if (result <= 0)
|
||||||
{
|
{
|
||||||
@ -491,10 +473,19 @@ HRESULT DirectX::SaveToEXRFile(const Image& image, const wchar_t* szFile)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create file and write header
|
// Create file and write header
|
||||||
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
ScopedHandle hFile(safe_handle(CreateFile2(
|
||||||
szFile,
|
szFile,
|
||||||
GENERIC_WRITE, 0, CREATE_ALWAYS,
|
GENERIC_WRITE, 0, CREATE_ALWAYS,
|
||||||
nullptr)));
|
nullptr)));
|
||||||
|
#else
|
||||||
|
ScopedHandle hFile(safe_handle(CreateFileW(
|
||||||
|
szFile,
|
||||||
|
GENERIC_WRITE, 0,
|
||||||
|
nullptr,
|
||||||
|
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL,
|
||||||
|
nullptr)));
|
||||||
|
#endif
|
||||||
if (!hFile)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -512,8 +503,8 @@ HRESULT DirectX::SaveToEXRFile(const Image& image, const wchar_t* szFile)
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
const auto width = static_cast<int>(image.width);
|
const int width = static_cast<int>(image.width);
|
||||||
const auto height = static_cast<int>(image.height);
|
const int height = static_cast<int>(image.height);
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
Imf::RgbaOutputFile file(stream, Imf::Header(width, height), Imf::WRITE_RGBA);
|
Imf::RgbaOutputFile file(stream, Imf::Header(width, height), Imf::WRITE_RGBA);
|
||||||
@ -528,9 +519,9 @@ HRESULT DirectX::SaveToEXRFile(const Image& image, const wchar_t* szFile)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const auto bytes = static_cast<uint64_t>(image.width) * static_cast<uint64_t>(image.height);
|
const uint64_t bytes = image.width * image.height;
|
||||||
|
|
||||||
if (bytes > static_cast<uint64_t>(UINT32_MAX))
|
if (bytes > UINT32_MAX)
|
||||||
{
|
{
|
||||||
return /* HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW) */ static_cast<HRESULT>(0x80070216L);
|
return /* HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW) */ static_cast<HRESULT>(0x80070216L);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
// File: DirectXTexEXR.h
|
// File: DirectXTexEXR.h
|
||||||
//
|
//
|
||||||
// DirectXTex Auxilary functions for using the OpenEXR library
|
// DirectXTex Auxillary functions for using the OpenEXR library
|
||||||
//
|
//
|
||||||
// Copyright (c) Microsoft Corporation.
|
// Copyright (c) Microsoft Corporation.
|
||||||
// Licensed under the MIT License.
|
// Licensed under the MIT License.
|
||||||
@ -14,15 +14,13 @@
|
|||||||
|
|
||||||
namespace DirectX
|
namespace DirectX
|
||||||
{
|
{
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromEXRFile(
|
HRESULT __cdecl GetMetadataFromEXRFile(
|
||||||
_In_z_ const wchar_t* szFile,
|
_In_z_ const wchar_t* szFile,
|
||||||
_Out_ TexMetadata& metadata);
|
_Out_ TexMetadata& metadata);
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromEXRFile(
|
HRESULT __cdecl LoadFromEXRFile(
|
||||||
_In_z_ const wchar_t* szFile,
|
_In_z_ const wchar_t* szFile,
|
||||||
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image);
|
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image);
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToEXRFile(
|
HRESULT __cdecl SaveToEXRFile(_In_ const Image& image, _In_z_ const wchar_t* szFile);
|
||||||
_In_ const Image& image,
|
|
||||||
_In_z_ const wchar_t* szFile);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,425 +0,0 @@
|
|||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// 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);
|
|
||||||
}
|
|
||||||
@ -1,430 +0,0 @@
|
|||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// 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);
|
|
||||||
}
|
|
||||||
@ -1,227 +0,0 @@
|
|||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// File: DirectXTexXbox.h
|
|
||||||
//
|
|
||||||
// DirectXTex Auxilary functions for Xbox texture processing
|
|
||||||
//
|
|
||||||
// Copyright (c) Microsoft Corporation.
|
|
||||||
// Licensed under the MIT License.
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#ifndef _M_X64
|
|
||||||
#error This tool is only supported for x64 native
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "DirectXTex.h"
|
|
||||||
|
|
||||||
#ifdef __clang__
|
|
||||||
#pragma clang diagnostic push
|
|
||||||
#pragma clang diagnostic ignored "-Wnonportable-system-include-path"
|
|
||||||
#pragma clang diagnostic ignored "-Wold-style-cast"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
#include <xg_xs.h>
|
|
||||||
#else
|
|
||||||
#include <xg.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __clang__
|
|
||||||
#pragma clang diagnostic pop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _GAMING_XBOX_SCARLETT
|
|
||||||
#include <d3d12_xs.h>
|
|
||||||
#elif defined(_GAMING_XBOX)
|
|
||||||
#include <d3d12_x.h>
|
|
||||||
#elif defined(_XBOX_ONE) && defined(_TITLE)
|
|
||||||
#include <d3d11_x.h>
|
|
||||||
#else
|
|
||||||
#include <d3d11_1.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <cstdint>
|
|
||||||
#include <utility>
|
|
||||||
|
|
||||||
#define DIRECTX_TEX_XBOX_VERSION 150
|
|
||||||
|
|
||||||
namespace Xbox
|
|
||||||
{
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
using XboxTileMode = XG_SWIZZLE_MODE;
|
|
||||||
constexpr XboxTileMode c_XboxTileModeInvalid = XG_SWIZZLE_MODE_INVALID;
|
|
||||||
constexpr XboxTileMode c_XboxTileModeLinear = XG_SWIZZLE_MODE_LINEAR;
|
|
||||||
#else
|
|
||||||
using XboxTileMode = XG_TILE_MODE;
|
|
||||||
constexpr XboxTileMode c_XboxTileModeInvalid = XG_TILE_MODE_INVALID;
|
|
||||||
constexpr XboxTileMode c_XboxTileModeLinear = XG_TILE_MODE_LINEAR;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class DIRECTX_TEX_API XboxImage
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
XboxImage() noexcept
|
|
||||||
: 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);
|
|
||||||
}
|
|
||||||
~XboxImage() { Release(); }
|
|
||||||
|
|
||||||
XboxImage& __cdecl operator= (XboxImage&& moveFrom) noexcept;
|
|
||||||
|
|
||||||
XboxImage(const XboxImage&) = delete;
|
|
||||||
XboxImage& operator=(const XboxImage&) = delete;
|
|
||||||
|
|
||||||
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 __cdecl Release();
|
|
||||||
|
|
||||||
const DirectX::TexMetadata& GetMetadata() const { return metadata; }
|
|
||||||
XboxTileMode GetTileMode() const { return tilemode; }
|
|
||||||
|
|
||||||
uint32_t GetSize() const { return dataSize; }
|
|
||||||
uint32_t GetAlignment() const { return baseAlignment; }
|
|
||||||
uint8_t* GetPointer() const { return memory; }
|
|
||||||
|
|
||||||
private:
|
|
||||||
uint32_t dataSize;
|
|
||||||
uint32_t baseAlignment;
|
|
||||||
XboxTileMode tilemode;
|
|
||||||
DirectX::TexMetadata metadata;
|
|
||||||
uint8_t* memory;
|
|
||||||
};
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------
|
|
||||||
// Image I/O
|
|
||||||
|
|
||||||
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);
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSFile(
|
|
||||||
_In_z_ const wchar_t* szFile, _Out_ DirectX::TexMetadata& metadata, _Out_ bool& isXbox);
|
|
||||||
|
|
||||||
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);
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSFileEx(
|
|
||||||
_In_z_ const wchar_t* szFile, _Out_ DirectX::TexMetadata& metadata, _Out_ bool& isXbox,
|
|
||||||
_Out_opt_ DirectX::DDSMetaData* ddPixelFormat);
|
|
||||||
|
|
||||||
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);
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSFile(
|
|
||||||
_In_z_ const wchar_t* szFile,
|
|
||||||
_Out_opt_ DirectX::TexMetadata* metadata, _Out_ XboxImage& image);
|
|
||||||
|
|
||||||
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);
|
|
||||||
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);
|
|
||||||
|
|
||||||
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)
|
|
||||||
|
|
||||||
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);
|
|
||||||
|
|
||||||
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__)
|
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl CreateTexture(
|
|
||||||
_In_ ID3D11DeviceX* d3dDevice,
|
|
||||||
_In_ const XboxImage& xbox, _Outptr_opt_ ID3D11Resource** ppResource, _Outptr_ void** grfxMemory);
|
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl CreateShaderResourceView(
|
|
||||||
_In_ ID3D11DeviceX* d3dDevice,
|
|
||||||
_In_ const XboxImage& xbox, _Outptr_opt_ ID3D11ShaderResourceView** ppSRV, _Outptr_ void** grfxMemory);
|
|
||||||
|
|
||||||
DIRECTX_TEX_API void __cdecl FreeTextureMemory(_In_ ID3D11DeviceX* d3dDevice, _In_opt_ void* grfxMemory);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------
|
|
||||||
// Direct3D 12.X functions
|
|
||||||
|
|
||||||
#if ((defined(_XBOX_ONE) && defined(_TITLE)) || defined(_GAMING_XBOX)) && (defined(__d3d12_x_h__) || defined(__XBOX_D3D12_X__))
|
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl CreateTexture(
|
|
||||||
_In_ ID3D12Device* d3dDevice,
|
|
||||||
_In_ const XboxImage& xbox, _Outptr_opt_ ID3D12Resource** ppResource, _Outptr_ 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
|
|
||||||
@ -1,258 +0,0 @@
|
|||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// DirectXTexD3D11X.cpp
|
|
||||||
//
|
|
||||||
// DirectXTex Auxilary functions for creating resouces from XboxImage containers
|
|
||||||
// via the CreatePlacement APIs
|
|
||||||
//
|
|
||||||
// Copyright (c) Microsoft Corporation.
|
|
||||||
// Licensed under the MIT License.
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#include "DirectXTexP.h"
|
|
||||||
#include "DirectXTexXbox.h"
|
|
||||||
|
|
||||||
#ifdef _GAMING_XBOX
|
|
||||||
#error This module is not supported for GDK
|
|
||||||
#elif !defined(_XBOX_ONE) || !defined(_TITLE)
|
|
||||||
#error This module only supports Xbox One exclusive apps
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using namespace Xbox;
|
|
||||||
using Microsoft::WRL::ComPtr;
|
|
||||||
|
|
||||||
namespace
|
|
||||||
{
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// Default XMemAlloc attributes for texture loading
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
const uint64_t c_XMemAllocAttributes = MAKE_XALLOC_ATTRIBUTES(
|
|
||||||
eXALLOCAllocatorId_MiddlewareReservedMin,
|
|
||||||
0,
|
|
||||||
XALLOC_MEMTYPE_GRAPHICS_WRITECOMBINE_GPU_READONLY,
|
|
||||||
XALLOC_PAGESIZE_64KB,
|
|
||||||
XALLOC_ALIGNMENT_64K);
|
|
||||||
}
|
|
||||||
|
|
||||||
//=====================================================================================
|
|
||||||
// Entry-points
|
|
||||||
//=====================================================================================
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Create a texture resource
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::CreateTexture(
|
|
||||||
ID3D11DeviceX* d3dDevice,
|
|
||||||
const XboxImage& xbox,
|
|
||||||
ID3D11Resource** ppResource,
|
|
||||||
void** grfxMemory)
|
|
||||||
{
|
|
||||||
if (!d3dDevice || !ppResource || !grfxMemory)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
*grfxMemory = nullptr;
|
|
||||||
*ppResource = nullptr;
|
|
||||||
|
|
||||||
if (!xbox.GetPointer() || !xbox.GetAlignment() || !xbox.GetSize() || xbox.GetTileMode() == c_XboxTileModeInvalid)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
// Allocate graphics memory
|
|
||||||
*grfxMemory = XMemAlloc(xbox.GetSize(), c_XMemAllocAttributes);
|
|
||||||
if (!*grfxMemory)
|
|
||||||
return E_OUTOFMEMORY;
|
|
||||||
|
|
||||||
// Copy tiled data into graphics memory
|
|
||||||
memcpy(*grfxMemory, xbox.GetPointer(), xbox.GetSize());
|
|
||||||
|
|
||||||
// Create texture resource
|
|
||||||
auto& metadata = xbox.GetMetadata();
|
|
||||||
|
|
||||||
HRESULT hr = E_FAIL;
|
|
||||||
|
|
||||||
switch (metadata.dimension)
|
|
||||||
{
|
|
||||||
case DirectX::TEX_DIMENSION_TEXTURE1D:
|
|
||||||
{
|
|
||||||
D3D11_TEXTURE1D_DESC desc = {};
|
|
||||||
desc.Width = static_cast<UINT>(metadata.width);
|
|
||||||
desc.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
desc.ArraySize = static_cast<UINT>(metadata.arraySize);
|
|
||||||
desc.Format = metadata.format;
|
|
||||||
desc.Usage = D3D11_USAGE_DEFAULT;
|
|
||||||
desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
|
|
||||||
|
|
||||||
ID3D11Texture1D* tex = nullptr;
|
|
||||||
hr = d3dDevice->CreatePlacementTexture1D(&desc, xbox.GetTileMode(), 0, *grfxMemory, &tex);
|
|
||||||
if (SUCCEEDED(hr) && tex)
|
|
||||||
{
|
|
||||||
*ppResource = tex;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case DirectX::TEX_DIMENSION_TEXTURE2D:
|
|
||||||
{
|
|
||||||
D3D11_TEXTURE2D_DESC desc = {};
|
|
||||||
desc.Width = static_cast<UINT>(metadata.width);
|
|
||||||
desc.Height = static_cast<UINT>(metadata.height);
|
|
||||||
desc.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
desc.ArraySize = static_cast<UINT>(metadata.arraySize);
|
|
||||||
desc.Format = metadata.format;
|
|
||||||
desc.SampleDesc.Count = 1;
|
|
||||||
desc.Usage = D3D11_USAGE_DEFAULT;
|
|
||||||
desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
|
|
||||||
desc.MiscFlags = (metadata.miscFlags & DirectX::TEX_MISC_TEXTURECUBE) ? D3D11_RESOURCE_MISC_TEXTURECUBE : 0;
|
|
||||||
|
|
||||||
ID3D11Texture2D* tex = nullptr;
|
|
||||||
hr = d3dDevice->CreatePlacementTexture2D(&desc, xbox.GetTileMode(), 0, *grfxMemory, &tex);
|
|
||||||
if (SUCCEEDED(hr) && tex)
|
|
||||||
{
|
|
||||||
*ppResource = tex;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case DirectX::TEX_DIMENSION_TEXTURE3D:
|
|
||||||
{
|
|
||||||
D3D11_TEXTURE3D_DESC desc = {};
|
|
||||||
desc.Width = static_cast<UINT>(metadata.width);
|
|
||||||
desc.Height = static_cast<UINT>(metadata.height);
|
|
||||||
desc.Depth = static_cast<UINT>(metadata.depth);
|
|
||||||
desc.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
desc.Format = metadata.format;
|
|
||||||
desc.Usage = D3D11_USAGE_DEFAULT;
|
|
||||||
desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
|
|
||||||
|
|
||||||
ID3D11Texture3D* tex = nullptr;
|
|
||||||
hr = d3dDevice->CreatePlacementTexture3D(&desc, xbox.GetTileMode(), 0, *grfxMemory, &tex);
|
|
||||||
if (SUCCEEDED(hr) && tex)
|
|
||||||
{
|
|
||||||
*ppResource = tex;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
hr = E_FAIL;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
XMemFree(grfxMemory, c_XMemAllocAttributes);
|
|
||||||
*grfxMemory = nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Create a shader resource view and associated texture
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::CreateShaderResourceView(
|
|
||||||
ID3D11DeviceX* d3dDevice,
|
|
||||||
const XboxImage& xbox,
|
|
||||||
ID3D11ShaderResourceView** ppSRV,
|
|
||||||
void** grfxMemory)
|
|
||||||
{
|
|
||||||
if (!ppSRV)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
*ppSRV = nullptr;
|
|
||||||
|
|
||||||
ComPtr<ID3D11Resource> resource;
|
|
||||||
HRESULT hr = CreateTexture(d3dDevice, xbox, resource.GetAddressOf(), grfxMemory);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
assert(resource);
|
|
||||||
|
|
||||||
auto& metadata = xbox.GetMetadata();
|
|
||||||
|
|
||||||
D3D11_SHADER_RESOURCE_VIEW_DESC SRVDesc = {};
|
|
||||||
SRVDesc.Format = metadata.format;
|
|
||||||
|
|
||||||
switch (metadata.dimension)
|
|
||||||
{
|
|
||||||
case DirectX::TEX_DIMENSION_TEXTURE1D:
|
|
||||||
if (metadata.arraySize > 1)
|
|
||||||
{
|
|
||||||
SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1DARRAY;
|
|
||||||
SRVDesc.Texture1DArray.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
SRVDesc.Texture1DArray.ArraySize = static_cast<UINT>(metadata.arraySize);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1D;
|
|
||||||
SRVDesc.Texture1D.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case DirectX::TEX_DIMENSION_TEXTURE2D:
|
|
||||||
if (metadata.IsCubemap())
|
|
||||||
{
|
|
||||||
if (metadata.arraySize > 6)
|
|
||||||
{
|
|
||||||
assert((metadata.arraySize % 6) == 0);
|
|
||||||
SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBEARRAY;
|
|
||||||
SRVDesc.TextureCubeArray.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
SRVDesc.TextureCubeArray.NumCubes = static_cast<UINT>(metadata.arraySize / 6);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE;
|
|
||||||
SRVDesc.TextureCube.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (metadata.arraySize > 1)
|
|
||||||
{
|
|
||||||
SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
|
|
||||||
SRVDesc.Texture2DArray.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
SRVDesc.Texture2DArray.ArraySize = static_cast<UINT>(metadata.arraySize);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
|
|
||||||
SRVDesc.Texture2D.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case DirectX::TEX_DIMENSION_TEXTURE3D:
|
|
||||||
assert(metadata.arraySize == 1);
|
|
||||||
SRVDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D;
|
|
||||||
SRVDesc.Texture3D.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
assert(grfxMemory != nullptr);
|
|
||||||
XMemFree(grfxMemory, c_XMemAllocAttributes);
|
|
||||||
*grfxMemory = nullptr;
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = d3dDevice->CreateShaderResourceView(resource.Get(), &SRVDesc, ppSRV);
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
XMemFree(grfxMemory, c_XMemAllocAttributes);
|
|
||||||
*grfxMemory = nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Free allocated graphics memory
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
void Xbox::FreeTextureMemory(ID3D11DeviceX* d3dDevice, void* grfxMemory)
|
|
||||||
{
|
|
||||||
UNREFERENCED_PARAMETER(d3dDevice); // used only for overload resolution
|
|
||||||
|
|
||||||
if (grfxMemory)
|
|
||||||
{
|
|
||||||
XMemFree(grfxMemory, c_XMemAllocAttributes);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,117 +0,0 @@
|
|||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// DirectXTexD3D12X.cpp
|
|
||||||
//
|
|
||||||
// DirectXTex Auxilary functions for creating resouces from XboxImage containers
|
|
||||||
// via the CreatePlacedResourceX API
|
|
||||||
//
|
|
||||||
// Copyright (c) Microsoft Corporation.
|
|
||||||
// Licensed under the MIT License.
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#include "DirectXTexP.h"
|
|
||||||
#include "DirectXTexXbox.h"
|
|
||||||
|
|
||||||
#if !(defined(_XBOX_ONE) && defined(_TITLE)) && !defined(_GAMING_XBOX)
|
|
||||||
#error This module only supports Xbox exclusive apps
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _GAMING_XBOX
|
|
||||||
#include <xmem.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using namespace Xbox;
|
|
||||||
using Microsoft::WRL::ComPtr;
|
|
||||||
|
|
||||||
namespace
|
|
||||||
{
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// Default XMemAlloc attributes for texture loading
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
const uint64_t c_XMemAllocAttributes = MAKE_XALLOC_ATTRIBUTES(
|
|
||||||
eXALLOCAllocatorId_MiddlewareReservedMin,
|
|
||||||
0,
|
|
||||||
XALLOC_MEMTYPE_GRAPHICS_WRITECOMBINE_GPU_READONLY,
|
|
||||||
XALLOC_PAGESIZE_64KB,
|
|
||||||
XALLOC_ALIGNMENT_64K
|
|
||||||
#ifdef _GAMING_XBOX
|
|
||||||
, 0
|
|
||||||
#endif
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
//=====================================================================================
|
|
||||||
// Entry-points
|
|
||||||
//=====================================================================================
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Create a texture resource
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::CreateTexture(
|
|
||||||
ID3D12Device* d3dDevice,
|
|
||||||
const XboxImage& xbox,
|
|
||||||
ID3D12Resource** ppResource,
|
|
||||||
void** grfxMemory)
|
|
||||||
{
|
|
||||||
if (!d3dDevice || !ppResource || !grfxMemory)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
*grfxMemory = nullptr;
|
|
||||||
*ppResource = nullptr;
|
|
||||||
|
|
||||||
if (!xbox.GetPointer() || !xbox.GetAlignment() || !xbox.GetSize() || xbox.GetTileMode() == c_XboxTileModeInvalid)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
// Allocate graphics memory
|
|
||||||
*grfxMemory = XMemAlloc(xbox.GetSize(), c_XMemAllocAttributes);
|
|
||||||
if (!*grfxMemory)
|
|
||||||
return E_OUTOFMEMORY;
|
|
||||||
|
|
||||||
// Copy tiled data into graphics memory
|
|
||||||
memcpy(*grfxMemory, xbox.GetPointer(), xbox.GetSize());
|
|
||||||
|
|
||||||
// Create texture resource
|
|
||||||
auto& metadata = xbox.GetMetadata();
|
|
||||||
|
|
||||||
D3D12_RESOURCE_DESC desc = {};
|
|
||||||
desc.Width = static_cast<UINT>(metadata.width);
|
|
||||||
desc.Height = static_cast<UINT>(metadata.height);
|
|
||||||
desc.MipLevels = static_cast<UINT16>(metadata.mipLevels);
|
|
||||||
desc.DepthOrArraySize = (metadata.dimension == DirectX::TEX_DIMENSION_TEXTURE3D) ? static_cast<UINT16>(metadata.depth) : static_cast<UINT16>(metadata.arraySize);
|
|
||||||
desc.Format = metadata.format;
|
|
||||||
desc.Flags = D3D12_RESOURCE_FLAG_NONE;
|
|
||||||
desc.SampleDesc.Count = 1;
|
|
||||||
desc.SampleDesc.Quality = 0;
|
|
||||||
desc.Dimension = static_cast<D3D12_RESOURCE_DIMENSION>(metadata.dimension);
|
|
||||||
desc.Layout = static_cast<D3D12_TEXTURE_LAYOUT>(0x100 | xbox.GetTileMode());
|
|
||||||
|
|
||||||
HRESULT hr = d3dDevice->CreatePlacedResourceX(
|
|
||||||
reinterpret_cast<D3D12_GPU_VIRTUAL_ADDRESS>(*grfxMemory),
|
|
||||||
&desc,
|
|
||||||
D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE,
|
|
||||||
nullptr,
|
|
||||||
IID_GRAPHICS_PPV_ARGS(ppResource));
|
|
||||||
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
XMemFree(*grfxMemory, c_XMemAllocAttributes);
|
|
||||||
*grfxMemory = nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Free allocated graphics memory
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
void Xbox::FreeTextureMemory(ID3D12Device* d3dDevice, void* grfxMemory)
|
|
||||||
{
|
|
||||||
UNREFERENCED_PARAMETER(d3dDevice); // used only for overload resolution
|
|
||||||
|
|
||||||
if (grfxMemory)
|
|
||||||
{
|
|
||||||
XMemFree(grfxMemory, c_XMemAllocAttributes);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,822 +0,0 @@
|
|||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// File: DirectXTexXboxDDS.cpp
|
|
||||||
//
|
|
||||||
// DirectXTex Auxilary functions for saving "XBOX" Xbox variants of DDS files
|
|
||||||
//
|
|
||||||
// Copyright (c) Microsoft Corporation.
|
|
||||||
// Licensed under the MIT License.
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#include "DirectXTexP.h"
|
|
||||||
#include "DirectXTexXbox.h"
|
|
||||||
|
|
||||||
#include "DDS.h"
|
|
||||||
|
|
||||||
#if defined(_GAMING_XBOX) || defined(_USE_GXDK)
|
|
||||||
#include "gxdk.h"
|
|
||||||
#else
|
|
||||||
#include "xdk.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using namespace DirectX;
|
|
||||||
using namespace Xbox;
|
|
||||||
|
|
||||||
namespace
|
|
||||||
{
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Decodes DDS header using XBOX extended header (variant of DX10 header)
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
HRESULT DecodeDDSHeader(
|
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource,
|
|
||||||
size_t size,
|
|
||||||
DirectX::TexMetadata& metadata,
|
|
||||||
_Out_opt_ DDSMetaData* ddPixelFormat,
|
|
||||||
_Out_opt_ XboxTileMode* tmode,
|
|
||||||
_Out_opt_ uint32_t* dataSize,
|
|
||||||
_Out_opt_ uint32_t* baseAlignment)
|
|
||||||
{
|
|
||||||
if (!pSource)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
if (tmode)
|
|
||||||
{
|
|
||||||
*tmode = c_XboxTileModeInvalid;
|
|
||||||
}
|
|
||||||
if (dataSize)
|
|
||||||
{
|
|
||||||
*dataSize = 0;
|
|
||||||
}
|
|
||||||
if (baseAlignment)
|
|
||||||
{
|
|
||||||
*baseAlignment = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
metadata = {};
|
|
||||||
|
|
||||||
if (ddPixelFormat)
|
|
||||||
{
|
|
||||||
*ddPixelFormat = {};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (size < DDS_MIN_HEADER_SIZE)
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
|
|
||||||
}
|
|
||||||
|
|
||||||
// DDS files always start with the same magic number ("DDS ")
|
|
||||||
const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(pSource);
|
|
||||||
if (dwMagicNumber != DDS_MAGIC)
|
|
||||||
{
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto pHeader = reinterpret_cast<const DDS_HEADER*>(reinterpret_cast<const uint8_t*>(pSource) + sizeof(uint32_t));
|
|
||||||
|
|
||||||
// Verify header to validate DDS file
|
|
||||||
if (pHeader->size != sizeof(DDS_HEADER)
|
|
||||||
|| pHeader->ddspf.size != sizeof(DDS_PIXELFORMAT))
|
|
||||||
{
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
metadata.mipLevels = pHeader->mipMapCount;
|
|
||||||
if (metadata.mipLevels == 0)
|
|
||||||
metadata.mipLevels = 1;
|
|
||||||
|
|
||||||
// Check for XBOX extension
|
|
||||||
if (!(pHeader->ddspf.flags & DDS_FOURCC)
|
|
||||||
|| (MAKEFOURCC('X', 'B', 'O', 'X') != pHeader->ddspf.fourCC))
|
|
||||||
{
|
|
||||||
// We know it's a DDS file, but it's not an XBOX extension
|
|
||||||
return S_FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Buffer must be big enough for both headers and magic value
|
|
||||||
if (size < DDS_XBOX_HEADER_SIZE)
|
|
||||||
{
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto xboxext = reinterpret_cast<const DDS_HEADER_XBOX*>(
|
|
||||||
reinterpret_cast<const uint8_t*>(pSource) + DDS_MIN_HEADER_SIZE);
|
|
||||||
|
|
||||||
metadata.arraySize = xboxext->arraySize;
|
|
||||||
if (metadata.arraySize == 0)
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
|
|
||||||
}
|
|
||||||
|
|
||||||
metadata.format = xboxext->dxgiFormat;
|
|
||||||
if (!IsValid(metadata.format))
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
|
|
||||||
}
|
|
||||||
|
|
||||||
static_assert(static_cast<int>(TEX_MISC_TEXTURECUBE) == static_cast<int>(DDS_RESOURCE_MISC_TEXTURECUBE), "DDS header mismatch");
|
|
||||||
|
|
||||||
metadata.miscFlags = xboxext->miscFlag & ~static_cast<uint32_t>(TEX_MISC_TEXTURECUBE);
|
|
||||||
|
|
||||||
switch (xboxext->resourceDimension)
|
|
||||||
{
|
|
||||||
case DDS_DIMENSION_TEXTURE1D:
|
|
||||||
|
|
||||||
if ((pHeader->flags & DDS_HEIGHT) && pHeader->height != 1)
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
|
|
||||||
}
|
|
||||||
|
|
||||||
metadata.width = pHeader->width;
|
|
||||||
metadata.height = 1;
|
|
||||||
metadata.depth = 1;
|
|
||||||
metadata.dimension = TEX_DIMENSION_TEXTURE1D;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case DDS_DIMENSION_TEXTURE2D:
|
|
||||||
if (xboxext->miscFlag & DDS_RESOURCE_MISC_TEXTURECUBE)
|
|
||||||
{
|
|
||||||
metadata.miscFlags |= TEX_MISC_TEXTURECUBE;
|
|
||||||
metadata.arraySize *= 6;
|
|
||||||
}
|
|
||||||
|
|
||||||
metadata.width = pHeader->width;
|
|
||||||
metadata.height = pHeader->height;
|
|
||||||
metadata.depth = 1;
|
|
||||||
metadata.dimension = TEX_DIMENSION_TEXTURE2D;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case DDS_DIMENSION_TEXTURE3D:
|
|
||||||
if (!(pHeader->flags & DDS_HEADER_FLAGS_VOLUME))
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (metadata.arraySize > 1)
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
|
|
||||||
metadata.width = pHeader->width;
|
|
||||||
metadata.height = pHeader->height;
|
|
||||||
metadata.depth = pHeader->depth;
|
|
||||||
metadata.dimension = TEX_DIMENSION_TEXTURE3D;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (static_cast<XboxTileMode>(xboxext->tileMode) == c_XboxTileModeInvalid)
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
else if (!(xboxext->tileMode & XBOX_TILEMODE_SCARLETT))
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
else if (xboxext->tileMode & XBOX_TILEMODE_SCARLETT)
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static_assert(static_cast<int>(TEX_MISC2_ALPHA_MODE_MASK) == static_cast<int>(DDS_MISC_FLAGS2_ALPHA_MODE_MASK), "DDS header mismatch");
|
|
||||||
|
|
||||||
static_assert(static_cast<int>(TEX_ALPHA_MODE_UNKNOWN) == static_cast<int>(DDS_ALPHA_MODE_UNKNOWN), "DDS header mismatch");
|
|
||||||
static_assert(static_cast<int>(TEX_ALPHA_MODE_STRAIGHT) == static_cast<int>(DDS_ALPHA_MODE_STRAIGHT), "DDS header mismatch");
|
|
||||||
static_assert(static_cast<int>(TEX_ALPHA_MODE_PREMULTIPLIED) == static_cast<int>(DDS_ALPHA_MODE_PREMULTIPLIED), "DDS header mismatch");
|
|
||||||
static_assert(static_cast<int>(TEX_ALPHA_MODE_OPAQUE) == static_cast<int>(DDS_ALPHA_MODE_OPAQUE), "DDS header mismatch");
|
|
||||||
static_assert(static_cast<int>(TEX_ALPHA_MODE_CUSTOM) == static_cast<int>(DDS_ALPHA_MODE_CUSTOM), "DDS header mismatch");
|
|
||||||
|
|
||||||
metadata.miscFlags2 = xboxext->miscFlags2;
|
|
||||||
|
|
||||||
if (tmode)
|
|
||||||
{
|
|
||||||
*tmode = static_cast<XboxTileMode>(xboxext->tileMode & ~XBOX_TILEMODE_SCARLETT);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (baseAlignment)
|
|
||||||
*baseAlignment = xboxext->baseAlignment;
|
|
||||||
|
|
||||||
if (dataSize)
|
|
||||||
*dataSize = xboxext->dataSize;
|
|
||||||
|
|
||||||
// Handle DDS-specific metadata
|
|
||||||
if (ddPixelFormat)
|
|
||||||
{
|
|
||||||
ddPixelFormat->size = pHeader->ddspf.size;
|
|
||||||
ddPixelFormat->flags = pHeader->ddspf.flags;
|
|
||||||
ddPixelFormat->fourCC = pHeader->ddspf.fourCC;
|
|
||||||
ddPixelFormat->RGBBitCount = pHeader->ddspf.RGBBitCount;
|
|
||||||
ddPixelFormat->RBitMask = pHeader->ddspf.RBitMask;
|
|
||||||
ddPixelFormat->GBitMask = pHeader->ddspf.GBitMask;
|
|
||||||
ddPixelFormat->BBitMask = pHeader->ddspf.BBitMask;
|
|
||||||
ddPixelFormat->ABitMask = pHeader->ddspf.ABitMask;
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//=====================================================================================
|
|
||||||
// Entry-points
|
|
||||||
//=====================================================================================
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Encodes DDS file header (magic value, header, XBOX extended header)
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::EncodeDDSHeader(
|
|
||||||
const XboxImage& xbox,
|
|
||||||
uint8_t* pDestination,
|
|
||||||
size_t maxsize) noexcept
|
|
||||||
{
|
|
||||||
if (!pDestination)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
if (maxsize < DDS_XBOX_HEADER_SIZE)
|
|
||||||
return E_NOT_SUFFICIENT_BUFFER;
|
|
||||||
|
|
||||||
*reinterpret_cast<uint32_t*>(pDestination) = DDS_MAGIC;
|
|
||||||
|
|
||||||
auto header = reinterpret_cast<DDS_HEADER*>(reinterpret_cast<uint8_t*>(pDestination) + sizeof(uint32_t));
|
|
||||||
|
|
||||||
memset(header, 0, sizeof(DDS_HEADER));
|
|
||||||
header->size = sizeof(DDS_HEADER);
|
|
||||||
header->flags = DDS_HEADER_FLAGS_TEXTURE;
|
|
||||||
header->caps = DDS_SURFACE_FLAGS_TEXTURE;
|
|
||||||
|
|
||||||
auto& metadata = xbox.GetMetadata();
|
|
||||||
|
|
||||||
if (metadata.mipLevels > 0)
|
|
||||||
{
|
|
||||||
header->flags |= DDS_HEADER_FLAGS_MIPMAP;
|
|
||||||
|
|
||||||
if (metadata.mipLevels > UINT32_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
header->mipMapCount = static_cast<uint32_t>(metadata.mipLevels);
|
|
||||||
|
|
||||||
if (header->mipMapCount > 1)
|
|
||||||
header->caps |= DDS_SURFACE_FLAGS_MIPMAP;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (metadata.dimension)
|
|
||||||
{
|
|
||||||
case TEX_DIMENSION_TEXTURE1D:
|
|
||||||
if (metadata.width > UINT32_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
header->width = static_cast<uint32_t>(metadata.width);
|
|
||||||
header->height = header->depth = 1;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TEX_DIMENSION_TEXTURE2D:
|
|
||||||
if (metadata.height > UINT32_MAX
|
|
||||||
|| metadata.width > UINT32_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
header->height = static_cast<uint32_t>(metadata.height);
|
|
||||||
header->width = static_cast<uint32_t>(metadata.width);
|
|
||||||
header->depth = 1;
|
|
||||||
|
|
||||||
if (metadata.IsCubemap())
|
|
||||||
{
|
|
||||||
header->caps |= DDS_SURFACE_FLAGS_CUBEMAP;
|
|
||||||
header->caps2 |= DDS_CUBEMAP_ALLFACES;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TEX_DIMENSION_TEXTURE3D:
|
|
||||||
if (metadata.height > UINT32_MAX
|
|
||||||
|| metadata.width > UINT32_MAX
|
|
||||||
|| metadata.depth > UINT32_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
header->flags |= DDS_HEADER_FLAGS_VOLUME;
|
|
||||||
header->caps2 |= DDS_FLAGS_VOLUME;
|
|
||||||
header->height = static_cast<uint32_t>(metadata.height);
|
|
||||||
header->width = static_cast<uint32_t>(metadata.width);
|
|
||||||
header->depth = static_cast<uint32_t>(metadata.depth);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t rowPitch, slicePitch;
|
|
||||||
ComputePitch(metadata.format, metadata.width, metadata.height, rowPitch, slicePitch, CP_FLAGS_NONE);
|
|
||||||
|
|
||||||
if (slicePitch > UINT32_MAX
|
|
||||||
|| rowPitch > UINT32_MAX)
|
|
||||||
return E_FAIL;
|
|
||||||
|
|
||||||
if (IsCompressed(metadata.format))
|
|
||||||
{
|
|
||||||
header->flags |= DDS_HEADER_FLAGS_LINEARSIZE;
|
|
||||||
header->pitchOrLinearSize = static_cast<uint32_t>(slicePitch);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
header->flags |= DDS_HEADER_FLAGS_PITCH;
|
|
||||||
header->pitchOrLinearSize = static_cast<uint32_t>(rowPitch);
|
|
||||||
}
|
|
||||||
|
|
||||||
memcpy_s(&header->ddspf, sizeof(header->ddspf), &DDSPF_XBOX, sizeof(DDS_PIXELFORMAT));
|
|
||||||
|
|
||||||
// Setup XBOX extended header
|
|
||||||
auto xboxext = reinterpret_cast<DDS_HEADER_XBOX*>(reinterpret_cast<uint8_t*>(header) + sizeof(DDS_HEADER));
|
|
||||||
|
|
||||||
memset(xboxext, 0, sizeof(DDS_HEADER_XBOX));
|
|
||||||
xboxext->dxgiFormat = metadata.format;
|
|
||||||
xboxext->resourceDimension = metadata.dimension;
|
|
||||||
|
|
||||||
if (metadata.arraySize > UINT32_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
static_assert(static_cast<int>(TEX_MISC_TEXTURECUBE) == static_cast<int>(DDS_RESOURCE_MISC_TEXTURECUBE), "DDS header mismatch");
|
|
||||||
xboxext->miscFlag = metadata.miscFlags & ~static_cast<uint32_t>(TEX_MISC_TEXTURECUBE);
|
|
||||||
|
|
||||||
if (metadata.miscFlags & TEX_MISC_TEXTURECUBE)
|
|
||||||
{
|
|
||||||
xboxext->miscFlag |= TEX_MISC_TEXTURECUBE;
|
|
||||||
assert((metadata.arraySize % 6) == 0);
|
|
||||||
xboxext->arraySize = static_cast<UINT>(metadata.arraySize / 6);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
xboxext->arraySize = static_cast<UINT>(metadata.arraySize);
|
|
||||||
}
|
|
||||||
|
|
||||||
static_assert(static_cast<int>(TEX_MISC2_ALPHA_MODE_MASK) == static_cast<int>(DDS_MISC_FLAGS2_ALPHA_MODE_MASK), "DDS header mismatch");
|
|
||||||
|
|
||||||
static_assert(static_cast<int>(TEX_ALPHA_MODE_UNKNOWN) == static_cast<int>(DDS_ALPHA_MODE_UNKNOWN), "DDS header mismatch");
|
|
||||||
static_assert(static_cast<int>(TEX_ALPHA_MODE_STRAIGHT) == static_cast<int>(DDS_ALPHA_MODE_STRAIGHT), "DDS header mismatch");
|
|
||||||
static_assert(static_cast<int>(TEX_ALPHA_MODE_PREMULTIPLIED) == static_cast<int>(DDS_ALPHA_MODE_PREMULTIPLIED), "DDS header mismatch");
|
|
||||||
static_assert(static_cast<int>(TEX_ALPHA_MODE_OPAQUE) == static_cast<int>(DDS_ALPHA_MODE_OPAQUE), "DDS header mismatch");
|
|
||||||
static_assert(static_cast<int>(TEX_ALPHA_MODE_CUSTOM) == static_cast<int>(DDS_ALPHA_MODE_CUSTOM), "DDS header mismatch");
|
|
||||||
|
|
||||||
xboxext->miscFlags2 = metadata.miscFlags2;
|
|
||||||
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
xboxext->tileMode = static_cast<uint32_t>(xbox.GetTileMode()) | XBOX_TILEMODE_SCARLETT;
|
|
||||||
#else
|
|
||||||
xboxext->tileMode = static_cast<uint32_t>(xbox.GetTileMode());
|
|
||||||
#endif
|
|
||||||
|
|
||||||
xboxext->baseAlignment = xbox.GetAlignment();
|
|
||||||
xboxext->dataSize = xbox.GetSize();
|
|
||||||
#ifdef _GXDK_VER
|
|
||||||
xboxext->xdkVer = _GXDK_VER;
|
|
||||||
#elif defined(_XDK_VER)
|
|
||||||
xboxext->xdkVer = _XDK_VER;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Obtain metadata from DDS file in memory/on disk
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::GetMetadataFromDDSMemory(
|
|
||||||
const uint8_t* pSource,
|
|
||||||
size_t size,
|
|
||||||
TexMetadata& metadata,
|
|
||||||
bool& isXbox)
|
|
||||||
{
|
|
||||||
return Xbox::GetMetadataFromDDSMemoryEx(pSource, size, metadata, isXbox, nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::GetMetadataFromDDSMemoryEx(
|
|
||||||
const uint8_t* pSource,
|
|
||||||
size_t size,
|
|
||||||
TexMetadata& metadata,
|
|
||||||
bool& isXbox,
|
|
||||||
DDSMetaData* ddPixelFormat)
|
|
||||||
{
|
|
||||||
if (!pSource || !size)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
isXbox = false;
|
|
||||||
|
|
||||||
HRESULT hr = DecodeDDSHeader(pSource, size, metadata, ddPixelFormat, nullptr, nullptr, nullptr);
|
|
||||||
|
|
||||||
if (hr == S_FALSE)
|
|
||||||
{
|
|
||||||
hr = DirectX::GetMetadataFromDDSMemoryEx(pSource, size, DirectX::DDS_FLAGS_NONE, metadata, ddPixelFormat);
|
|
||||||
}
|
|
||||||
else if (SUCCEEDED(hr))
|
|
||||||
{
|
|
||||||
isXbox = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::GetMetadataFromDDSFile(
|
|
||||||
const wchar_t* szFile,
|
|
||||||
TexMetadata& metadata,
|
|
||||||
bool& isXbox)
|
|
||||||
{
|
|
||||||
return Xbox::GetMetadataFromDDSFileEx(szFile, metadata, isXbox, nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::GetMetadataFromDDSFileEx(
|
|
||||||
const wchar_t* szFile,
|
|
||||||
TexMetadata& metadata,
|
|
||||||
bool& isXbox,
|
|
||||||
DDSMetaData* ddPixelFormat)
|
|
||||||
{
|
|
||||||
if (!szFile)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
isXbox = false;
|
|
||||||
|
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
|
||||||
szFile,
|
|
||||||
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
|
||||||
nullptr)));
|
|
||||||
if (!hFile)
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get the file size
|
|
||||||
FILE_STANDARD_INFO fileInfo;
|
|
||||||
if (!GetFileInformationByHandleEx(hFile.get(), FileStandardInfo, &fileInfo, sizeof(fileInfo)))
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
|
||||||
}
|
|
||||||
|
|
||||||
// File is too big for 32-bit allocation, so reject read (4 GB should be plenty large enough for a valid DDS file)
|
|
||||||
if (fileInfo.EndOfFile.HighPart > 0)
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_FILE_TOO_LARGE);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Need at least enough data to fill the standard header and magic number to be a valid DDS
|
|
||||||
if (fileInfo.EndOfFile.LowPart < DDS_MIN_HEADER_SIZE)
|
|
||||||
{
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Read the header in (including extended header if present)
|
|
||||||
uint8_t header[DDS_XBOX_HEADER_SIZE] = {};
|
|
||||||
|
|
||||||
DWORD bytesRead = 0;
|
|
||||||
if (!ReadFile(hFile.get(), header, DDS_XBOX_HEADER_SIZE, &bytesRead, nullptr))
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT hr = DecodeDDSHeader(header, bytesRead, metadata, ddPixelFormat, nullptr, nullptr, nullptr);
|
|
||||||
|
|
||||||
if (hr == S_FALSE)
|
|
||||||
{
|
|
||||||
hr = DirectX::GetMetadataFromDDSMemoryEx(header, bytesRead, DirectX::DDS_FLAGS_NONE, metadata, ddPixelFormat);
|
|
||||||
}
|
|
||||||
else if (SUCCEEDED(hr))
|
|
||||||
{
|
|
||||||
isXbox = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Load a DDS file in memory
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::LoadFromDDSMemory(
|
|
||||||
const uint8_t* pSource,
|
|
||||||
size_t size,
|
|
||||||
TexMetadata* metadata,
|
|
||||||
XboxImage& xbox)
|
|
||||||
{
|
|
||||||
return Xbox::LoadFromDDSMemoryEx(pSource, size, metadata, nullptr, xbox);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::LoadFromDDSMemoryEx(
|
|
||||||
const uint8_t* pSource,
|
|
||||||
size_t size,
|
|
||||||
TexMetadata* metadata,
|
|
||||||
DDSMetaData* ddPixelFormat,
|
|
||||||
XboxImage& xbox)
|
|
||||||
{
|
|
||||||
if (!pSource || !size)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
xbox.Release();
|
|
||||||
|
|
||||||
TexMetadata mdata;
|
|
||||||
uint32_t dataSize;
|
|
||||||
uint32_t baseAlignment;
|
|
||||||
XboxTileMode tmode;
|
|
||||||
HRESULT hr = DecodeDDSHeader(pSource, size, mdata, ddPixelFormat, &tmode, &dataSize, &baseAlignment);
|
|
||||||
if (hr == S_FALSE)
|
|
||||||
{
|
|
||||||
// It's a DDS, but not an XBOX variant
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
}
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!dataSize || !baseAlignment)
|
|
||||||
{
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (size <= DDS_XBOX_HEADER_SIZE)
|
|
||||||
{
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Copy tiled data
|
|
||||||
const size_t remaining = size - DDS_XBOX_HEADER_SIZE;
|
|
||||||
|
|
||||||
if (remaining < dataSize)
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_HANDLE_EOF);
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = xbox.Initialize(mdata, tmode, dataSize, baseAlignment);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
assert(xbox.GetPointer() != nullptr);
|
|
||||||
|
|
||||||
memcpy(xbox.GetPointer(), reinterpret_cast<const uint8_t*>(pSource) + DDS_XBOX_HEADER_SIZE, dataSize);
|
|
||||||
|
|
||||||
if (metadata)
|
|
||||||
memcpy(metadata, &mdata, sizeof(TexMetadata));
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Load a DDS file from disk
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::LoadFromDDSFile(
|
|
||||||
const wchar_t* szFile,
|
|
||||||
TexMetadata* metadata,
|
|
||||||
XboxImage& xbox)
|
|
||||||
{
|
|
||||||
return Xbox::LoadFromDDSFileEx(szFile, metadata, nullptr, xbox);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::LoadFromDDSFileEx(
|
|
||||||
const wchar_t* szFile,
|
|
||||||
TexMetadata* metadata,
|
|
||||||
DDSMetaData* ddPixelFormat,
|
|
||||||
XboxImage& xbox)
|
|
||||||
{
|
|
||||||
if (!szFile)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
xbox.Release();
|
|
||||||
|
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
|
||||||
szFile,
|
|
||||||
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
|
||||||
nullptr)));
|
|
||||||
if (!hFile)
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get the file size
|
|
||||||
FILE_STANDARD_INFO fileInfo;
|
|
||||||
if (!GetFileInformationByHandleEx(hFile.get(), FileStandardInfo, &fileInfo, sizeof(fileInfo)))
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
|
||||||
}
|
|
||||||
|
|
||||||
// File is too big for 32-bit allocation, so reject read (4 GB should be plenty large enough for a valid DDS file)
|
|
||||||
if (fileInfo.EndOfFile.HighPart > 0)
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_FILE_TOO_LARGE);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Need at least enough data to fill the standard header and magic number to be a valid DDS
|
|
||||||
if (fileInfo.EndOfFile.LowPart < DDS_MIN_HEADER_SIZE)
|
|
||||||
{
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Read the header in (including extended header if present)
|
|
||||||
uint8_t header[DDS_XBOX_HEADER_SIZE] = {};
|
|
||||||
|
|
||||||
DWORD bytesRead = 0;
|
|
||||||
if (!ReadFile(hFile.get(), header, DDS_XBOX_HEADER_SIZE, &bytesRead, nullptr))
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
|
||||||
}
|
|
||||||
|
|
||||||
TexMetadata mdata;
|
|
||||||
XboxTileMode tmode;
|
|
||||||
uint32_t dataSize;
|
|
||||||
uint32_t baseAlignment;
|
|
||||||
HRESULT hr = DecodeDDSHeader(header, bytesRead, mdata, ddPixelFormat, &tmode, &dataSize, &baseAlignment);
|
|
||||||
if (hr == S_FALSE)
|
|
||||||
{
|
|
||||||
// It's a DDS, but not an XBOX variant
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
}
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
if (!dataSize || !baseAlignment)
|
|
||||||
{
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Read tiled data
|
|
||||||
const DWORD remaining = fileInfo.EndOfFile.LowPart - DDS_XBOX_HEADER_SIZE;
|
|
||||||
if (remaining == 0)
|
|
||||||
return E_FAIL;
|
|
||||||
|
|
||||||
if (remaining < dataSize)
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_HANDLE_EOF);
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = xbox.Initialize(mdata, tmode, dataSize, baseAlignment);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
assert(xbox.GetPointer() != nullptr);
|
|
||||||
|
|
||||||
if (!ReadFile(hFile.get(), xbox.GetPointer(), dataSize, &bytesRead, nullptr))
|
|
||||||
{
|
|
||||||
xbox.Release();
|
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (metadata)
|
|
||||||
memcpy(metadata, &mdata, sizeof(TexMetadata));
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Save a DDS file to memory
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::SaveToDDSMemory(const XboxImage& xbox, Blob& blob)
|
|
||||||
{
|
|
||||||
if (!xbox.GetPointer() || !xbox.GetSize() || !xbox.GetAlignment())
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
blob.Release();
|
|
||||||
|
|
||||||
HRESULT hr = blob.Initialize(DDS_XBOX_HEADER_SIZE + xbox.GetSize());
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
// Copy header
|
|
||||||
auto pDestination = blob.GetBufferPointer();
|
|
||||||
assert(pDestination);
|
|
||||||
|
|
||||||
hr = EncodeDDSHeader(xbox, pDestination, DDS_XBOX_HEADER_SIZE);
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
blob.Release();
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Copy tiled data
|
|
||||||
const size_t remaining = blob.GetBufferSize() - DDS_XBOX_HEADER_SIZE;
|
|
||||||
pDestination += DDS_XBOX_HEADER_SIZE;
|
|
||||||
|
|
||||||
if (!remaining)
|
|
||||||
{
|
|
||||||
blob.Release();
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (remaining < xbox.GetSize())
|
|
||||||
{
|
|
||||||
blob.Release();
|
|
||||||
return E_UNEXPECTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
memcpy(pDestination, xbox.GetPointer(), xbox.GetSize());
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Save a DDS file to disk
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::SaveToDDSFile(const XboxImage& xbox, const wchar_t* szFile)
|
|
||||||
{
|
|
||||||
if (!szFile || !xbox.GetPointer() || !xbox.GetSize() || !xbox.GetAlignment())
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
// Create DDS Header
|
|
||||||
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
|
|
||||||
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>(DDS_XBOX_HEADER_SIZE), &bytesWritten, nullptr))
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bytesWritten != DDS_XBOX_HEADER_SIZE)
|
|
||||||
{
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write tiled data
|
|
||||||
if (!WriteFile(hFile.get(), xbox.GetPointer(), static_cast<DWORD>(xbox.GetSize()), &bytesWritten, nullptr))
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bytesWritten != xbox.GetSize())
|
|
||||||
{
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// Adapters for /Zc:wchar_t- clients
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
|
|
||||||
|
|
||||||
namespace Xbox
|
|
||||||
{
|
|
||||||
HRESULT __cdecl GetMetadataFromDDSFile(
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_Out_ DirectX::TexMetadata& metadata,
|
|
||||||
_Out_ bool& isXbox)
|
|
||||||
{
|
|
||||||
return GetMetadataFromDDSFile(reinterpret_cast<const unsigned short*>(szFile), metadata, isXbox);
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT __cdecl GetMetadataFromDDSFileEx(
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_Out_ DirectX::TexMetadata& metadata,
|
|
||||||
_Out_ bool& isXbox,
|
|
||||||
_Out_opt_ DirectX::DDSMetaData* ddPixelFormat)
|
|
||||||
{
|
|
||||||
return GetMetadataFromDDSFileEx(reinterpret_cast<const unsigned short*>(szFile), metadata, isXbox, ddPixelFormat);
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT __cdecl LoadFromDDSFile(
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_Out_opt_ DirectX::TexMetadata* metadata,
|
|
||||||
_Out_ XboxImage& image)
|
|
||||||
{
|
|
||||||
return LoadFromDDSFile(reinterpret_cast<const unsigned short*>(szFile), metadata, image);
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT __cdecl LoadFromDDSFileEx(
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_Out_opt_ DirectX::TexMetadata* metadata,
|
|
||||||
_Out_opt_ DirectX::DDSMetaData* ddPixelFormat,
|
|
||||||
_Out_ XboxImage& image)
|
|
||||||
{
|
|
||||||
return LoadFromDDSFileEx(reinterpret_cast<const unsigned short*>(szFile), metadata, ddPixelFormat, image);
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT __cdecl SaveToDDSFile(_In_ const XboxImage& xbox, _In_z_ const __wchar_t* szFile)
|
|
||||||
{
|
|
||||||
return SaveToDDSFile(xbox, reinterpret_cast<const unsigned short*>(szFile));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // !_NATIVE_WCHAR_T_DEFINED
|
|
||||||
@ -1,559 +0,0 @@
|
|||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// File: DirectXTexXboxDetile.cpp
|
|
||||||
//
|
|
||||||
// DirectXTex Auxilary functions for converting from Xbox tiled to linear
|
|
||||||
//
|
|
||||||
// Copyright (c) Microsoft Corporation.
|
|
||||||
// Licensed under the MIT License.
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#include "DirectXTexP.h"
|
|
||||||
#include "DirectXTexXbox.h"
|
|
||||||
|
|
||||||
using Microsoft::WRL::ComPtr;
|
|
||||||
using namespace DirectX;
|
|
||||||
using namespace DirectX::Internal;
|
|
||||||
using namespace Xbox;
|
|
||||||
|
|
||||||
namespace
|
|
||||||
{
|
|
||||||
//----------------------------------------------------------------------------------
|
|
||||||
inline HRESULT DetileByElement1D(
|
|
||||||
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,
|
|
||||||
bool packed)
|
|
||||||
{
|
|
||||||
const uint8_t* sptr = xbox.GetPointer();
|
|
||||||
const uint8_t* endPtr = sptr + layout.SizeBytes;
|
|
||||||
|
|
||||||
assert((nimages > 0) && (nimages <= UINT32_MAX));
|
|
||||||
|
|
||||||
for (size_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 (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, static_cast<uint32_t>(level), element, 0, static_cast<uint32_t>(item), 0, nullptr);
|
|
||||||
#else
|
|
||||||
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;
|
|
||||||
|
|
||||||
const uint8_t* src = sptr + offset;
|
|
||||||
|
|
||||||
if ((src + bpp) > endPtr)
|
|
||||||
return E_FAIL;
|
|
||||||
|
|
||||||
memcpy(dptr, src, bpp);
|
|
||||||
dptr += bpp;
|
|
||||||
|
|
||||||
if (packed)
|
|
||||||
++x;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// 1D Tiling
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
HRESULT Detile1D(
|
|
||||||
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 || nimages > UINT32_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
if (!xbox.GetPointer() || !computer || !result || !result[0])
|
|
||||||
return E_POINTER;
|
|
||||||
|
|
||||||
assert(layout.Planes == 1);
|
|
||||||
|
|
||||||
const DXGI_FORMAT format = result[0]->format;
|
|
||||||
|
|
||||||
assert(format == xbox.GetMetadata().format);
|
|
||||||
|
|
||||||
assert(!IsCompressed(format));
|
|
||||||
|
|
||||||
bool byelement = IsTypeless(format);
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
if (nimages > 1)
|
|
||||||
byelement = true;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
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;
|
|
||||||
assert(((w + 1) / 2) == layout.Plane[0].MipLayout[level].WidthElements);
|
|
||||||
|
|
||||||
return DetileByElement1D(xbox, level, computer, layout, result, nimages, bpp, w, 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;
|
|
||||||
assert(w == layout.Plane[0].MipLayout[level].WidthElements);
|
|
||||||
|
|
||||||
return DetileByElement1D(xbox, level, computer, layout, result, nimages, bpp, w, false);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//--- Standard format handling ------------------------------------------------
|
|
||||||
auto& mip = layout.Plane[0].MipLayout[level];
|
|
||||||
|
|
||||||
const UINT32 tiledPixels = mip.PitchPixels * 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 (size_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);
|
|
||||||
|
|
||||||
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, static_cast<uint32_t>(item), 0, nullptr);
|
|
||||||
#else
|
|
||||||
size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, static_cast<uint32_t>(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);
|
|
||||||
|
|
||||||
target[x] = tiled[offset];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!StoreScanline(img->pixels, img->rowPitch, img->format, target, img->width))
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// 2D Tiling
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
HRESULT Detile2D(
|
|
||||||
const XboxImage& xbox,
|
|
||||||
uint32_t level,
|
|
||||||
_In_ XGTextureAddressComputer* computer,
|
|
||||||
_In_reads_(nimages) const Image** result,
|
|
||||||
size_t nimages)
|
|
||||||
{
|
|
||||||
if (!nimages || nimages > UINT32_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
if (!xbox.GetPointer() || !computer || !result || !result[0])
|
|
||||||
return E_POINTER;
|
|
||||||
|
|
||||||
assert(xbox.GetMetadata().format == result[0]->format);
|
|
||||||
|
|
||||||
uint8_t* baseAddr = xbox.GetPointer();
|
|
||||||
const auto& metadata = xbox.GetMetadata();
|
|
||||||
|
|
||||||
for (size_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);
|
|
||||||
|
|
||||||
HRESULT hr = computer->CopyFromSubresource(
|
|
||||||
img->pixels,
|
|
||||||
0u,
|
|
||||||
metadata.CalculateSubresource(level, item),
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
0u,
|
|
||||||
#endif
|
|
||||||
baseAddr,
|
|
||||||
static_cast<UINT32>(img->rowPitch),
|
|
||||||
0u);
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// 3D Tiling
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
HRESULT Detile3D(
|
|
||||||
const XboxImage& xbox,
|
|
||||||
uint32_t level,
|
|
||||||
_In_ XGTextureAddressComputer* computer,
|
|
||||||
const Image& result)
|
|
||||||
{
|
|
||||||
if (!computer || !xbox.GetPointer() || !result.pixels)
|
|
||||||
return E_POINTER;
|
|
||||||
|
|
||||||
assert(xbox.GetMetadata().format == result.format);
|
|
||||||
|
|
||||||
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)
|
|
||||||
0u,
|
|
||||||
#endif
|
|
||||||
baseAddr,
|
|
||||||
static_cast<UINT32>(result.rowPitch),
|
|
||||||
static_cast<UINT32>(result.slicePitch));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//=====================================================================================
|
|
||||||
// Entry-points
|
|
||||||
//=====================================================================================
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Detile image
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::Detile(
|
|
||||||
const XboxImage& xbox,
|
|
||||||
DirectX::ScratchImage& image)
|
|
||||||
{
|
|
||||||
if (!xbox.GetSize() || !xbox.GetPointer() || xbox.GetTileMode() == c_XboxTileModeInvalid)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
image.Release();
|
|
||||||
|
|
||||||
auto& metadata = xbox.GetMetadata();
|
|
||||||
|
|
||||||
if (metadata.format == DXGI_FORMAT_R1_UNORM
|
|
||||||
|| IsVideo(metadata.format))
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (metadata.format)
|
|
||||||
{
|
|
||||||
case DXGI_FORMAT_R32G32B32_TYPELESS:
|
|
||||||
case DXGI_FORMAT_R32G32B32_FLOAT:
|
|
||||||
case DXGI_FORMAT_R32G32B32_UINT:
|
|
||||||
case DXGI_FORMAT_R32G32B32_SINT:
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
XG_RESOURCE_LAYOUT layout = {};
|
|
||||||
|
|
||||||
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;
|
|
||||||
|
|
||||||
XG_TEXTURE1D_DESC desc = {};
|
|
||||||
desc.Width = static_cast<UINT>(metadata.width);
|
|
||||||
desc.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
desc.ArraySize = static_cast<UINT>(metadata.arraySize);
|
|
||||||
desc.Format = static_cast<XG_FORMAT>(metadata.format);
|
|
||||||
desc.Usage = XG_USAGE_DEFAULT;
|
|
||||||
desc.BindFlags = XG_BIND_SHADER_RESOURCE;
|
|
||||||
desc.MiscFlags = (metadata.IsCubemap()) ? XG_RESOURCE_MISC_TEXTURECUBE : 0;
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
desc.SwizzleMode = xbox.GetTileMode();
|
|
||||||
#else
|
|
||||||
desc.TileMode = xbox.GetTileMode();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ComPtr<XGTextureAddressComputer> computer;
|
|
||||||
HRESULT hr = XGCreateTexture1DComputer(&desc, computer.GetAddressOf());
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
hr = computer->GetResourceLayout(&layout);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
if (layout.Planes != 1)
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
|
|
||||||
if (layout.SizeBytes != xbox.GetSize()
|
|
||||||
|| layout.BaseAlignmentBytes != xbox.GetAlignment())
|
|
||||||
return E_UNEXPECTED;
|
|
||||||
|
|
||||||
hr = image.Initialize(metadata);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
for (size_t level = 0; level < metadata.mipLevels; ++level)
|
|
||||||
{
|
|
||||||
if (metadata.arraySize > 1)
|
|
||||||
{
|
|
||||||
std::vector<const Image*> images;
|
|
||||||
images.reserve(metadata.arraySize);
|
|
||||||
for (size_t item = 0; item < metadata.arraySize; ++item)
|
|
||||||
{
|
|
||||||
const Image* img = image.GetImage(level, item, 0);
|
|
||||||
if (!img)
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
images.push_back(img);
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = Detile1D(xbox, static_cast<uint32_t>(level), computer.Get(), layout, &images[0], images.size());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
const Image* img = image.GetImage(level, 0, 0);
|
|
||||||
if (!img)
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = Detile1D(xbox, static_cast<uint32_t>(level), computer.Get(), layout, &img, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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;
|
|
||||||
|
|
||||||
XG_TEXTURE2D_DESC desc = {};
|
|
||||||
desc.Width = static_cast<UINT>(metadata.width);
|
|
||||||
desc.Height = static_cast<UINT>(metadata.height);
|
|
||||||
desc.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
desc.ArraySize = static_cast<UINT>(metadata.arraySize);
|
|
||||||
desc.Format = static_cast<XG_FORMAT>(metadata.format);
|
|
||||||
desc.SampleDesc.Count = 1;
|
|
||||||
desc.Usage = XG_USAGE_DEFAULT;
|
|
||||||
desc.BindFlags = XG_BIND_SHADER_RESOURCE;
|
|
||||||
desc.MiscFlags = (metadata.miscFlags & TEX_MISC_TEXTURECUBE) ? XG_RESOURCE_MISC_TEXTURECUBE : 0;
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
desc.SwizzleMode = xbox.GetTileMode();
|
|
||||||
#else
|
|
||||||
desc.TileMode = xbox.GetTileMode();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ComPtr<XGTextureAddressComputer> computer;
|
|
||||||
HRESULT hr = XGCreateTexture2DComputer(&desc, computer.GetAddressOf());
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
hr = computer->GetResourceLayout(&layout);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
if (layout.Planes != 1)
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
|
|
||||||
if (layout.SizeBytes != xbox.GetSize()
|
|
||||||
|| layout.BaseAlignmentBytes != xbox.GetAlignment())
|
|
||||||
return E_UNEXPECTED;
|
|
||||||
|
|
||||||
hr = image.Initialize(metadata);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
for (size_t level = 0; level < metadata.mipLevels; ++level)
|
|
||||||
{
|
|
||||||
if (metadata.arraySize > 1)
|
|
||||||
{
|
|
||||||
std::vector<const Image*> images;
|
|
||||||
images.reserve(metadata.arraySize);
|
|
||||||
for (size_t item = 0; item < metadata.arraySize; ++item)
|
|
||||||
{
|
|
||||||
const Image* img = image.GetImage(level, item, 0);
|
|
||||||
if (!img)
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
images.push_back(img);
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = Detile2D(xbox, static_cast<uint32_t>(level), computer.Get(), &images[0], images.size());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
const Image* img = image.GetImage(level, 0, 0);
|
|
||||||
if (!img)
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = Detile2D(xbox, static_cast<uint32_t>(level), computer.Get(), &img, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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;
|
|
||||||
|
|
||||||
XG_TEXTURE3D_DESC desc = {};
|
|
||||||
desc.Width = static_cast<UINT>(metadata.width);
|
|
||||||
desc.Height = static_cast<UINT>(metadata.height);
|
|
||||||
desc.Depth = static_cast<UINT>(metadata.depth);
|
|
||||||
desc.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
desc.Format = static_cast<XG_FORMAT>(metadata.format);
|
|
||||||
desc.Usage = XG_USAGE_DEFAULT;
|
|
||||||
desc.BindFlags = XG_BIND_SHADER_RESOURCE;
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
desc.SwizzleMode = xbox.GetTileMode();
|
|
||||||
#else
|
|
||||||
desc.TileMode = xbox.GetTileMode();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ComPtr<XGTextureAddressComputer> computer;
|
|
||||||
HRESULT hr = XGCreateTexture3DComputer(&desc, computer.GetAddressOf());
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
hr = computer->GetResourceLayout(&layout);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
if (layout.Planes != 1)
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
|
|
||||||
if (layout.SizeBytes != xbox.GetSize()
|
|
||||||
|| layout.BaseAlignmentBytes != xbox.GetAlignment())
|
|
||||||
return E_UNEXPECTED;
|
|
||||||
|
|
||||||
hr = image.Initialize(metadata);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
auto d = static_cast<uint32_t>(metadata.depth);
|
|
||||||
|
|
||||||
size_t index = 0;
|
|
||||||
for (size_t level = 0; level < metadata.mipLevels; ++level)
|
|
||||||
{
|
|
||||||
if ((index + d) > image.GetImageCount())
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Relies on the fact that slices are contiguous
|
|
||||||
hr = Detile3D(xbox, static_cast<uint32_t>(level), computer.Get(), image.GetImages()[index]);
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
index += d;
|
|
||||||
|
|
||||||
if (d > 1)
|
|
||||||
d >>= 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
@ -1,319 +0,0 @@
|
|||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// File: DirectXTexXboxImage.cpp
|
|
||||||
//
|
|
||||||
// DirectXTex Auxilary functions for Xbox texture blob
|
|
||||||
//
|
|
||||||
// Copyright (c) Microsoft Corporation.
|
|
||||||
// Licensed under the MIT License.
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#include "DirectXTexP.h"
|
|
||||||
#include "DirectXTexXbox.h"
|
|
||||||
|
|
||||||
using namespace DirectX;
|
|
||||||
using namespace Xbox;
|
|
||||||
|
|
||||||
// Sanity check XG library values against DirectXTex's values
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_UNKNOWN) == static_cast<int>(DXGI_FORMAT_UNKNOWN), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G32B32A32_TYPELESS) == static_cast<int>(DXGI_FORMAT_R32G32B32A32_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G32B32A32_FLOAT) == static_cast<int>(DXGI_FORMAT_R32G32B32A32_FLOAT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G32B32A32_UINT) == static_cast<int>(DXGI_FORMAT_R32G32B32A32_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G32B32A32_SINT) == static_cast<int>(DXGI_FORMAT_R32G32B32A32_SINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G32B32_TYPELESS) == static_cast<int>(DXGI_FORMAT_R32G32B32_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G32B32_FLOAT) == static_cast<int>(DXGI_FORMAT_R32G32B32_FLOAT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G32B32_UINT) == static_cast<int>(DXGI_FORMAT_R32G32B32_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G32B32_SINT) == static_cast<int>(DXGI_FORMAT_R32G32B32_SINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16G16B16A16_TYPELESS) == static_cast<int>(DXGI_FORMAT_R16G16B16A16_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16G16B16A16_FLOAT) == static_cast<int>(DXGI_FORMAT_R16G16B16A16_FLOAT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16G16B16A16_UNORM) == static_cast<int>(DXGI_FORMAT_R16G16B16A16_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16G16B16A16_UINT) == static_cast<int>(DXGI_FORMAT_R16G16B16A16_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16G16B16A16_SNORM) == static_cast<int>(DXGI_FORMAT_R16G16B16A16_SNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16G16B16A16_SINT) == static_cast<int>(DXGI_FORMAT_R16G16B16A16_SINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G32_TYPELESS) == static_cast<int>(DXGI_FORMAT_R32G32_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G32_FLOAT) == static_cast<int>(DXGI_FORMAT_R32G32_FLOAT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G32_UINT) == static_cast<int>(DXGI_FORMAT_R32G32_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G32_SINT) == static_cast<int>(DXGI_FORMAT_R32G32_SINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32G8X24_TYPELESS) == static_cast<int>(DXGI_FORMAT_R32G8X24_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_D32_FLOAT_S8X24_UINT) == static_cast<int>(DXGI_FORMAT_D32_FLOAT_S8X24_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32_FLOAT_X8X24_TYPELESS) == static_cast<int>(DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_X32_TYPELESS_G8X24_UINT) == static_cast<int>(DXGI_FORMAT_X32_TYPELESS_G8X24_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R10G10B10A2_TYPELESS) == static_cast<int>(DXGI_FORMAT_R10G10B10A2_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R10G10B10A2_UNORM) == static_cast<int>(DXGI_FORMAT_R10G10B10A2_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R10G10B10A2_UINT) == static_cast<int>(DXGI_FORMAT_R10G10B10A2_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R11G11B10_FLOAT) == static_cast<int>(DXGI_FORMAT_R11G11B10_FLOAT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8G8B8A8_TYPELESS) == static_cast<int>(DXGI_FORMAT_R8G8B8A8_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8G8B8A8_UNORM) == static_cast<int>(DXGI_FORMAT_R8G8B8A8_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8G8B8A8_UNORM_SRGB) == static_cast<int>(DXGI_FORMAT_R8G8B8A8_UNORM_SRGB), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8G8B8A8_UINT) == static_cast<int>(DXGI_FORMAT_R8G8B8A8_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8G8B8A8_SNORM) == static_cast<int>(DXGI_FORMAT_R8G8B8A8_SNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8G8B8A8_SINT) == static_cast<int>(DXGI_FORMAT_R8G8B8A8_SINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16G16_TYPELESS) == static_cast<int>(DXGI_FORMAT_R16G16_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16G16_FLOAT) == static_cast<int>(DXGI_FORMAT_R16G16_FLOAT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16G16_UNORM) == static_cast<int>(DXGI_FORMAT_R16G16_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16G16_UINT) == static_cast<int>(DXGI_FORMAT_R16G16_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16G16_SNORM) == static_cast<int>(DXGI_FORMAT_R16G16_SNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16G16_SINT) == static_cast<int>(DXGI_FORMAT_R16G16_SINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32_TYPELESS) == static_cast<int>(DXGI_FORMAT_R32_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_D32_FLOAT) == static_cast<int>(DXGI_FORMAT_D32_FLOAT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32_FLOAT) == static_cast<int>(DXGI_FORMAT_R32_FLOAT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32_UINT) == static_cast<int>(DXGI_FORMAT_R32_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R32_SINT) == static_cast<int>(DXGI_FORMAT_R32_SINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R24G8_TYPELESS) == static_cast<int>(DXGI_FORMAT_R24G8_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_D24_UNORM_S8_UINT) == static_cast<int>(DXGI_FORMAT_D24_UNORM_S8_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R24_UNORM_X8_TYPELESS) == static_cast<int>(DXGI_FORMAT_R24_UNORM_X8_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_X24_TYPELESS_G8_UINT) == static_cast<int>(DXGI_FORMAT_X24_TYPELESS_G8_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8G8_TYPELESS) == static_cast<int>(DXGI_FORMAT_R8G8_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8G8_UNORM) == static_cast<int>(DXGI_FORMAT_R8G8_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8G8_UINT) == static_cast<int>(DXGI_FORMAT_R8G8_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8G8_SNORM) == static_cast<int>(DXGI_FORMAT_R8G8_SNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8G8_SINT) == static_cast<int>(DXGI_FORMAT_R8G8_SINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16_TYPELESS) == static_cast<int>(DXGI_FORMAT_R16_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16_FLOAT) == static_cast<int>(DXGI_FORMAT_R16_FLOAT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_D16_UNORM) == static_cast<int>(DXGI_FORMAT_D16_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16_UNORM) == static_cast<int>(DXGI_FORMAT_R16_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16_UINT) == static_cast<int>(DXGI_FORMAT_R16_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16_SNORM) == static_cast<int>(DXGI_FORMAT_R16_SNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R16_SINT) == static_cast<int>(DXGI_FORMAT_R16_SINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8_TYPELESS) == static_cast<int>(DXGI_FORMAT_R8_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8_UNORM) == static_cast<int>(DXGI_FORMAT_R8_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8_UINT) == static_cast<int>(DXGI_FORMAT_R8_UINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8_SNORM) == static_cast<int>(DXGI_FORMAT_R8_SNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8_SINT) == static_cast<int>(DXGI_FORMAT_R8_SINT), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_A8_UNORM) == static_cast<int>(DXGI_FORMAT_A8_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R1_UNORM) == static_cast<int>(DXGI_FORMAT_R1_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R9G9B9E5_SHAREDEXP) == static_cast<int>(DXGI_FORMAT_R9G9B9E5_SHAREDEXP), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R8G8_B8G8_UNORM) == static_cast<int>(DXGI_FORMAT_R8G8_B8G8_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_G8R8_G8B8_UNORM) == static_cast<int>(DXGI_FORMAT_G8R8_G8B8_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC1_TYPELESS) == static_cast<int>(DXGI_FORMAT_BC1_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC1_UNORM) == static_cast<int>(DXGI_FORMAT_BC1_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC1_UNORM_SRGB) == static_cast<int>(DXGI_FORMAT_BC1_UNORM_SRGB), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC2_TYPELESS) == static_cast<int>(DXGI_FORMAT_BC2_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC2_UNORM) == static_cast<int>(DXGI_FORMAT_BC2_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC2_UNORM_SRGB) == static_cast<int>(DXGI_FORMAT_BC2_UNORM_SRGB), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC3_TYPELESS) == static_cast<int>(DXGI_FORMAT_BC3_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC3_UNORM) == static_cast<int>(DXGI_FORMAT_BC3_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC3_UNORM_SRGB) == static_cast<int>(DXGI_FORMAT_BC3_UNORM_SRGB), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC4_TYPELESS) == static_cast<int>(DXGI_FORMAT_BC4_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC4_UNORM) == static_cast<int>(DXGI_FORMAT_BC4_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC4_SNORM) == static_cast<int>(DXGI_FORMAT_BC4_SNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC5_TYPELESS) == static_cast<int>(DXGI_FORMAT_BC5_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC5_UNORM) == static_cast<int>(DXGI_FORMAT_BC5_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC5_SNORM) == static_cast<int>(DXGI_FORMAT_BC5_SNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_B5G6R5_UNORM) == static_cast<int>(DXGI_FORMAT_B5G6R5_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_B5G5R5A1_UNORM) == static_cast<int>(DXGI_FORMAT_B5G5R5A1_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_B8G8R8A8_UNORM) == static_cast<int>(DXGI_FORMAT_B8G8R8A8_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_B8G8R8X8_UNORM) == static_cast<int>(DXGI_FORMAT_B8G8R8X8_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_R10G10B10_XR_BIAS_A2_UNORM) == static_cast<int>(DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_B8G8R8A8_TYPELESS) == static_cast<int>(DXGI_FORMAT_B8G8R8A8_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_B8G8R8A8_UNORM_SRGB) == static_cast<int>(DXGI_FORMAT_B8G8R8A8_UNORM_SRGB), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_B8G8R8X8_TYPELESS) == static_cast<int>(DXGI_FORMAT_B8G8R8X8_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_B8G8R8X8_UNORM_SRGB) == static_cast<int>(DXGI_FORMAT_B8G8R8X8_UNORM_SRGB), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC6H_TYPELESS) == static_cast<int>(DXGI_FORMAT_BC6H_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC6H_UF16) == static_cast<int>(DXGI_FORMAT_BC6H_UF16), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC6H_SF16) == static_cast<int>(DXGI_FORMAT_BC6H_SF16), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC7_TYPELESS) == static_cast<int>(DXGI_FORMAT_BC7_TYPELESS), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC7_UNORM) == static_cast<int>(DXGI_FORMAT_BC7_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_BC7_UNORM_SRGB) == static_cast<int>(DXGI_FORMAT_BC7_UNORM_SRGB), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_AYUV) == static_cast<int>(DXGI_FORMAT_AYUV), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_Y410) == static_cast<int>(DXGI_FORMAT_Y410), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_Y416) == static_cast<int>(DXGI_FORMAT_Y416), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_NV12) == static_cast<int>(DXGI_FORMAT_NV12), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_P010) == static_cast<int>(DXGI_FORMAT_P010), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_P016) == static_cast<int>(DXGI_FORMAT_P016), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_420_OPAQUE) == static_cast<int>(DXGI_FORMAT_420_OPAQUE), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_YUY2) == static_cast<int>(DXGI_FORMAT_YUY2), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_Y210) == static_cast<int>(DXGI_FORMAT_Y210), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_Y216) == static_cast<int>(DXGI_FORMAT_Y216), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_NV11) == static_cast<int>(DXGI_FORMAT_NV11), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_AI44) == static_cast<int>(DXGI_FORMAT_AI44), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_IA44) == static_cast<int>(DXGI_FORMAT_IA44), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_P8) == static_cast<int>(DXGI_FORMAT_P8), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_A8P8) == static_cast<int>(DXGI_FORMAT_A8P8), "XG vs. DXGI mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_FORMAT_B4G4R4A4_UNORM) == static_cast<int>(DXGI_FORMAT_B4G4R4A4_UNORM), "XG vs. DXGI mismatch");
|
|
||||||
|
|
||||||
static_assert(static_cast<int>(XG_RESOURCE_DIMENSION_TEXTURE1D) == static_cast<int>(TEX_DIMENSION_TEXTURE1D), "XG vs. Direct3D 11 mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_RESOURCE_DIMENSION_TEXTURE2D) == static_cast<int>(TEX_DIMENSION_TEXTURE2D), "XG vs. Direct3D 11 mismatch");
|
|
||||||
static_assert(static_cast<int>(XG_RESOURCE_DIMENSION_TEXTURE3D) == static_cast<int>(TEX_DIMENSION_TEXTURE3D), "XG vs. Direct3D 11 mismatch");
|
|
||||||
|
|
||||||
static_assert(static_cast<int>(XG_RESOURCE_MISC_TEXTURECUBE) == static_cast<int>(TEX_MISC_TEXTURECUBE), "XG vs. Direct3D 11 mismatch");
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// Initialize memory
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
XboxImage& XboxImage::operator= (XboxImage&& moveFrom) noexcept
|
|
||||||
{
|
|
||||||
if (this != &moveFrom)
|
|
||||||
{
|
|
||||||
Release();
|
|
||||||
|
|
||||||
dataSize = moveFrom.dataSize;
|
|
||||||
baseAlignment = moveFrom.baseAlignment;
|
|
||||||
tilemode = moveFrom.tilemode;
|
|
||||||
metadata = moveFrom.metadata;
|
|
||||||
memory = moveFrom.memory;
|
|
||||||
|
|
||||||
moveFrom.dataSize = 0;
|
|
||||||
moveFrom.baseAlignment = 0;
|
|
||||||
moveFrom.tilemode = c_XboxTileModeInvalid;
|
|
||||||
moveFrom.memory = nullptr;
|
|
||||||
}
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT XboxImage::Initialize(const XG_TEXTURE1D_DESC& desc, const XG_RESOURCE_LAYOUT& layout, uint32_t miscFlags2)
|
|
||||||
{
|
|
||||||
if (!layout.SizeBytes || !layout.BaseAlignmentBytes)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
Release();
|
|
||||||
|
|
||||||
if (layout.SizeBytes > UINT32_MAX
|
|
||||||
|| layout.BaseAlignmentBytes > UINT32_MAX)
|
|
||||||
return E_FAIL;
|
|
||||||
|
|
||||||
memory = reinterpret_cast<uint8_t*>(_aligned_malloc(layout.SizeBytes, 16));
|
|
||||||
if (!memory)
|
|
||||||
return E_OUTOFMEMORY;
|
|
||||||
|
|
||||||
memset(memory, 0, layout.SizeBytes);
|
|
||||||
|
|
||||||
memset(&metadata, 0, sizeof(metadata));
|
|
||||||
metadata.width = desc.Width;
|
|
||||||
metadata.height = 1;
|
|
||||||
metadata.depth = 1;
|
|
||||||
metadata.arraySize = desc.ArraySize;
|
|
||||||
metadata.mipLevels = layout.MipLevels;
|
|
||||||
metadata.format = static_cast<DXGI_FORMAT>(desc.Format);
|
|
||||||
metadata.dimension = TEX_DIMENSION_TEXTURE1D;
|
|
||||||
metadata.miscFlags2 = miscFlags2;
|
|
||||||
|
|
||||||
dataSize = static_cast<uint32_t>(layout.SizeBytes);
|
|
||||||
baseAlignment = static_cast<uint32_t>(layout.BaseAlignmentBytes);
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
tilemode = desc.SwizzleMode;
|
|
||||||
#else
|
|
||||||
tilemode = desc.TileMode;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT XboxImage::Initialize(const XG_TEXTURE2D_DESC& desc, const XG_RESOURCE_LAYOUT& layout, uint32_t miscFlags2)
|
|
||||||
{
|
|
||||||
if (!layout.SizeBytes || !layout.BaseAlignmentBytes)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
Release();
|
|
||||||
|
|
||||||
if (layout.SizeBytes > UINT32_MAX
|
|
||||||
|| layout.BaseAlignmentBytes > UINT32_MAX)
|
|
||||||
return E_FAIL;
|
|
||||||
|
|
||||||
memory = reinterpret_cast<uint8_t*>(_aligned_malloc(layout.SizeBytes, 16));
|
|
||||||
if (!memory)
|
|
||||||
return E_OUTOFMEMORY;
|
|
||||||
|
|
||||||
memset(memory, 0, layout.SizeBytes);
|
|
||||||
|
|
||||||
memset(&metadata, 0, sizeof(metadata));
|
|
||||||
metadata.width = desc.Width;
|
|
||||||
metadata.height = desc.Height;
|
|
||||||
metadata.depth = 1;
|
|
||||||
metadata.arraySize = desc.ArraySize;
|
|
||||||
metadata.mipLevels = layout.MipLevels;
|
|
||||||
metadata.miscFlags = (desc.MiscFlags & XG_RESOURCE_MISC_TEXTURECUBE) ? TEX_MISC_TEXTURECUBE : 0;
|
|
||||||
metadata.format = static_cast<DXGI_FORMAT>(desc.Format);
|
|
||||||
metadata.dimension = TEX_DIMENSION_TEXTURE2D;
|
|
||||||
metadata.miscFlags2 = miscFlags2;
|
|
||||||
|
|
||||||
dataSize = static_cast<uint32_t>(layout.SizeBytes);
|
|
||||||
baseAlignment = static_cast<uint32_t>(layout.BaseAlignmentBytes);
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
tilemode = desc.SwizzleMode;
|
|
||||||
#else
|
|
||||||
tilemode = desc.TileMode;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT XboxImage::Initialize(const XG_TEXTURE3D_DESC& desc, const XG_RESOURCE_LAYOUT& layout, uint32_t miscFlags2)
|
|
||||||
{
|
|
||||||
if (!layout.SizeBytes || !layout.BaseAlignmentBytes)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
Release();
|
|
||||||
|
|
||||||
if (layout.SizeBytes > UINT32_MAX
|
|
||||||
|| layout.BaseAlignmentBytes > UINT32_MAX)
|
|
||||||
return E_FAIL;
|
|
||||||
|
|
||||||
memory = reinterpret_cast<uint8_t*>(_aligned_malloc(layout.SizeBytes, 16));
|
|
||||||
if (!memory)
|
|
||||||
return E_OUTOFMEMORY;
|
|
||||||
|
|
||||||
memset(memory, 0, layout.SizeBytes);
|
|
||||||
|
|
||||||
memset(&metadata, 0, sizeof(metadata));
|
|
||||||
metadata.width = desc.Width;
|
|
||||||
metadata.height = desc.Height;
|
|
||||||
metadata.depth = desc.Depth;
|
|
||||||
metadata.arraySize = 1;
|
|
||||||
metadata.mipLevels = layout.MipLevels;
|
|
||||||
metadata.format = static_cast<DXGI_FORMAT>(desc.Format);
|
|
||||||
metadata.dimension = TEX_DIMENSION_TEXTURE3D;
|
|
||||||
metadata.miscFlags2 = miscFlags2;
|
|
||||||
|
|
||||||
dataSize = static_cast<uint32_t>(layout.SizeBytes);
|
|
||||||
baseAlignment = static_cast<uint32_t>(layout.BaseAlignmentBytes);
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
tilemode = desc.SwizzleMode;
|
|
||||||
#else
|
|
||||||
tilemode = desc.TileMode;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT XboxImage::Initialize(const DirectX::TexMetadata& mdata, XboxTileMode tm, uint32_t size, uint32_t alignment)
|
|
||||||
{
|
|
||||||
if (!size || !alignment || tm == c_XboxTileModeInvalid)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
Release();
|
|
||||||
|
|
||||||
memory = reinterpret_cast<uint8_t*>(_aligned_malloc(size, 16));
|
|
||||||
if (!memory)
|
|
||||||
return E_OUTOFMEMORY;
|
|
||||||
|
|
||||||
memset(memory, 0, size);
|
|
||||||
|
|
||||||
metadata = mdata;
|
|
||||||
|
|
||||||
dataSize = size;
|
|
||||||
baseAlignment = alignment;
|
|
||||||
tilemode = tm;
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// Release memory
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
void XboxImage::Release()
|
|
||||||
{
|
|
||||||
if (memory)
|
|
||||||
{
|
|
||||||
_aligned_free(memory);
|
|
||||||
memory = nullptr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,758 +0,0 @@
|
|||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// File: DirectXTexXboxTile.cpp
|
|
||||||
//
|
|
||||||
// DirectXTex Auxilary functions for converting from linear to Xbox tiling
|
|
||||||
//
|
|
||||||
// Copyright (c) Microsoft Corporation.
|
|
||||||
// Licensed under the MIT License.
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#include "DirectXTexP.h"
|
|
||||||
#include "DirectXTexXbox.h"
|
|
||||||
|
|
||||||
//#define VERBOSE
|
|
||||||
|
|
||||||
using Microsoft::WRL::ComPtr;
|
|
||||||
using namespace DirectX;
|
|
||||||
using namespace DirectX::Internal;
|
|
||||||
using namespace Xbox;
|
|
||||||
|
|
||||||
namespace
|
|
||||||
{
|
|
||||||
//----------------------------------------------------------------------------------
|
|
||||||
inline HRESULT TileByElement1D(
|
|
||||||
_In_reads_(nimages) const Image* const * images,
|
|
||||||
size_t nimages,
|
|
||||||
uint32_t level,
|
|
||||||
_In_ XGTextureAddressComputer* computer,
|
|
||||||
_In_ const XG_RESOURCE_LAYOUT& layout,
|
|
||||||
const XboxImage& xbox,
|
|
||||||
size_t bpp,
|
|
||||||
size_t w,
|
|
||||||
bool packed)
|
|
||||||
{
|
|
||||||
uint8_t* dptr = xbox.GetPointer();
|
|
||||||
const uint8_t* endPtr = dptr + layout.SizeBytes;
|
|
||||||
|
|
||||||
for (size_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 (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, 0, static_cast<uint32_t>(item), 0, nullptr);
|
|
||||||
#else
|
|
||||||
size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, static_cast<uint32_t>(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, sptr, bpp);
|
|
||||||
sptr += bpp;
|
|
||||||
|
|
||||||
if (packed)
|
|
||||||
++x;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------
|
|
||||||
#ifdef VERBOSE
|
|
||||||
void DebugPrintDesc(const XG_TEXTURE1D_DESC& desc)
|
|
||||||
{
|
|
||||||
wchar_t buff[2048] = {};
|
|
||||||
swprintf_s(buff, L"XG_TEXTURE1D_DESC = { %u, %u, %u, %u, %u, %u, %u, %u, %u, %u }\n",
|
|
||||||
desc.Width, desc.MipLevels, desc.ArraySize, desc.Format, desc.Usage, desc.BindFlags, desc.CPUAccessFlags, desc.MiscFlags,
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
desc.SwizzleMode,
|
|
||||||
#else
|
|
||||||
desc.TileMode,
|
|
||||||
#endif
|
|
||||||
desc.Pitch);
|
|
||||||
OutputDebugStringW(buff);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DebugPrintDesc(const XG_TEXTURE2D_DESC& desc)
|
|
||||||
{
|
|
||||||
wchar_t buff[2048] = {};
|
|
||||||
swprintf_s(buff, L"XG_TEXTURE2D_DESC = { %u, %u, %u, %u, %u, { %u, %u }, %u, %u, %u, %u, %u, %u }\n",
|
|
||||||
desc.Width, desc.Height, desc.MipLevels, desc.ArraySize, desc.Format, desc.SampleDesc.Count, desc.SampleDesc.Quality, desc.Usage, desc.BindFlags, desc.CPUAccessFlags, desc.MiscFlags,
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
desc.SwizzleMode,
|
|
||||||
#else
|
|
||||||
desc.TileMode,
|
|
||||||
#endif
|
|
||||||
desc.Pitch);
|
|
||||||
OutputDebugStringW(buff);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DebugPrintDesc(const XG_TEXTURE3D_DESC& desc)
|
|
||||||
{
|
|
||||||
wchar_t buff[2048] = {};
|
|
||||||
swprintf_s(buff, L"XG_TEXTURE3D_DESC = { %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u }\n",
|
|
||||||
desc.Width, desc.Height, desc.Depth, desc.MipLevels, desc.Format, desc.Usage, desc.BindFlags, desc.CPUAccessFlags, desc.MiscFlags,
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
desc.SwizzleMode,
|
|
||||||
#else
|
|
||||||
desc.TileMode,
|
|
||||||
#endif
|
|
||||||
desc.Pitch);
|
|
||||||
OutputDebugStringW(buff);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DebugPrintLayout(const XG_RESOURCE_LAYOUT& layout)
|
|
||||||
{
|
|
||||||
wchar_t buff[2048] = {};
|
|
||||||
|
|
||||||
swprintf_s(buff, L"Layout %u planes, %uD, %u mips, %llu size, %llu alignment\n", layout.Planes, layout.Dimension - 1, layout.MipLevels, layout.SizeBytes, layout.BaseAlignmentBytes);
|
|
||||||
OutputDebugStringW(buff);
|
|
||||||
|
|
||||||
for (size_t p = 0; p < layout.Planes; ++p)
|
|
||||||
{
|
|
||||||
auto& plane = layout.Plane[p];
|
|
||||||
|
|
||||||
swprintf_s(buff, L"Plane %zu: %u bpe, %llu size, %llu offset, %llu alignment\n", p, plane.BytesPerElement, plane.SizeBytes, plane.BaseOffsetBytes, plane.BaseAlignmentBytes);
|
|
||||||
OutputDebugStringW(buff);
|
|
||||||
|
|
||||||
for (size_t level = 0; level < layout.MipLevels; ++level)
|
|
||||||
{
|
|
||||||
auto& mip = plane.MipLayout[level];
|
|
||||||
|
|
||||||
swprintf_s(buff, L"\tLevel %zu: %llu size, %llu slice2D, %llu offset, %u alignment\n", level, mip.SizeBytes, mip.Slice2DSizeBytes, mip.OffsetBytes, mip.AlignmentBytes);
|
|
||||||
OutputDebugStringW(buff);
|
|
||||||
|
|
||||||
swprintf_s(buff, L"\t\t%u x %u x %u (padded %u x %u x %u)\n", mip.WidthElements, mip.HeightElements, mip.DepthOrArraySize,
|
|
||||||
mip.PaddedWidthElements, mip.PaddedHeightElements, mip.PaddedDepthOrArraySize);
|
|
||||||
OutputDebugStringW(buff);
|
|
||||||
|
|
||||||
swprintf_s(buff, L"\t\tpitch %u pixels (%u bytes)\n", mip.PitchPixels, mip.PitchBytes);
|
|
||||||
OutputDebugStringW(buff);
|
|
||||||
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
swprintf_s(buff, L"\t\t\t%u samples, %u swizzlemode\n", mip.SampleCount, mip.SwizzleMode);
|
|
||||||
#else
|
|
||||||
swprintf_s(buff, L"\t\t\t%u samples, %u tilemode\n", mip.SampleCount, mip.TileMode);
|
|
||||||
#endif
|
|
||||||
OutputDebugStringW(buff);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// 1D Tiling
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
HRESULT Tile1D(
|
|
||||||
_In_reads_(nimages) const Image** images,
|
|
||||||
size_t nimages,
|
|
||||||
uint32_t level,
|
|
||||||
_In_ XGTextureAddressComputer* computer,
|
|
||||||
const XG_RESOURCE_LAYOUT& layout,
|
|
||||||
const XboxImage& xbox)
|
|
||||||
{
|
|
||||||
if (!nimages || nimages > UINT32_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
if (!images || !images[0] || !computer || !xbox.GetPointer())
|
|
||||||
return E_POINTER;
|
|
||||||
|
|
||||||
assert(layout.Planes == 1);
|
|
||||||
|
|
||||||
const DXGI_FORMAT format = images[0]->format;
|
|
||||||
|
|
||||||
assert(format == xbox.GetMetadata().format);
|
|
||||||
|
|
||||||
assert(!IsCompressed(format));
|
|
||||||
|
|
||||||
bool byelement = IsTypeless(format);
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
if (nimages > 1)
|
|
||||||
byelement = true;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
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;
|
|
||||||
assert(((w + 1) / 2) == layout.Plane[0].MipLayout[level].WidthElements);
|
|
||||||
|
|
||||||
return TileByElement1D(images, nimages, level, computer, layout, xbox, bpp, w, 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;
|
|
||||||
assert(w == layout.Plane[0].MipLayout[level].WidthElements);
|
|
||||||
|
|
||||||
return TileByElement1D(images, nimages, level, computer, layout, xbox, bpp, w, false);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//--- Standard format handling ------------------------------------------------
|
|
||||||
auto& mip = layout.Plane[0].MipLayout[level];
|
|
||||||
|
|
||||||
const UINT32 tiledPixels = mip.PitchPixels * 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 (size_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);
|
|
||||||
|
|
||||||
if (!LoadScanline(row, img->width, img->pixels, img->rowPitch, img->format))
|
|
||||||
return E_FAIL;
|
|
||||||
|
|
||||||
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, static_cast<uint32_t>(item), 0, nullptr);
|
|
||||||
#else
|
|
||||||
size_t offset = computer->GetTexelElementOffsetBytes(0, level, x, 0, static_cast<uint32_t>(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];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// 2D Tiling
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
HRESULT Tile2D(
|
|
||||||
_In_reads_(nimages) const Image** images,
|
|
||||||
size_t nimages,
|
|
||||||
uint32_t level,
|
|
||||||
_In_ XGTextureAddressComputer* computer,
|
|
||||||
const XboxImage& xbox)
|
|
||||||
{
|
|
||||||
if (!nimages || nimages > UINT32_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
if (!images || !images[0] || !computer || !xbox.GetPointer())
|
|
||||||
return E_POINTER;
|
|
||||||
|
|
||||||
uint8_t* baseAddr = xbox.GetPointer();
|
|
||||||
const auto& metadata = xbox.GetMetadata();
|
|
||||||
|
|
||||||
for (size_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);
|
|
||||||
|
|
||||||
HRESULT hr = computer->CopyIntoSubresource(
|
|
||||||
baseAddr,
|
|
||||||
0u,
|
|
||||||
metadata.CalculateSubresource(level, item),
|
|
||||||
img->pixels,
|
|
||||||
static_cast<UINT32>(img->rowPitch),
|
|
||||||
0u);
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// 3D Tiling
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
HRESULT Tile3D(
|
|
||||||
const Image& image,
|
|
||||||
uint32_t level,
|
|
||||||
_In_ XGTextureAddressComputer* computer,
|
|
||||||
const XboxImage& xbox)
|
|
||||||
{
|
|
||||||
if (!image.pixels || !computer || !xbox.GetPointer())
|
|
||||||
return E_POINTER;
|
|
||||||
|
|
||||||
uint8_t* baseAddr = xbox.GetPointer();
|
|
||||||
const auto& metadata = xbox.GetMetadata();
|
|
||||||
|
|
||||||
return computer->CopyIntoSubresource(
|
|
||||||
baseAddr,
|
|
||||||
0u,
|
|
||||||
metadata.CalculateSubresource(level, 0),
|
|
||||||
image.pixels,
|
|
||||||
static_cast<UINT32>(image.rowPitch),
|
|
||||||
static_cast<UINT32>(image.slicePitch));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//=====================================================================================
|
|
||||||
// Entry-points
|
|
||||||
//=====================================================================================
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Tile image
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::Tile(
|
|
||||||
const DirectX::Image& srcImage,
|
|
||||||
XboxImage& xbox,
|
|
||||||
XboxTileMode mode)
|
|
||||||
{
|
|
||||||
if (!srcImage.pixels
|
|
||||||
|| srcImage.width > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION
|
|
||||||
|| srcImage.height > D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
xbox.Release();
|
|
||||||
|
|
||||||
if (srcImage.format == DXGI_FORMAT_R1_UNORM
|
|
||||||
|| IsVideo(srcImage.format))
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mode == c_XboxTileModeInvalid)
|
|
||||||
{
|
|
||||||
// If no specific tile mode is given, assume the optimal default
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
mode = XGComputeOptimalSwizzleMode(XG_RESOURCE_DIMENSION_TEXTURE2D, static_cast<XG_FORMAT>(srcImage.format),
|
|
||||||
static_cast<UINT>(srcImage.width), static_cast<UINT>(srcImage.height),
|
|
||||||
1, 1, XG_BIND_SHADER_RESOURCE);
|
|
||||||
#else
|
|
||||||
mode = XGComputeOptimalTileMode(XG_RESOURCE_DIMENSION_TEXTURE2D, static_cast<XG_FORMAT>(srcImage.format),
|
|
||||||
static_cast<UINT>(srcImage.width), static_cast<UINT>(srcImage.height),
|
|
||||||
1, 1, XG_BIND_SHADER_RESOURCE);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
XG_TEXTURE2D_DESC desc = {};
|
|
||||||
desc.Width = static_cast<UINT>(srcImage.width);
|
|
||||||
desc.Height = static_cast<UINT>(srcImage.height);
|
|
||||||
desc.MipLevels = 1;
|
|
||||||
desc.ArraySize = 1;
|
|
||||||
desc.Format = static_cast<XG_FORMAT>(srcImage.format);
|
|
||||||
desc.SampleDesc.Count = 1;
|
|
||||||
desc.Usage = XG_USAGE_DEFAULT;
|
|
||||||
desc.BindFlags = XG_BIND_SHADER_RESOURCE;
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
desc.SwizzleMode = mode;
|
|
||||||
#else
|
|
||||||
desc.TileMode = mode;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ComPtr<XGTextureAddressComputer> computer;
|
|
||||||
HRESULT hr = XGCreateTexture2DComputer(&desc, computer.GetAddressOf());
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
XG_RESOURCE_LAYOUT layout;
|
|
||||||
hr = computer->GetResourceLayout(&layout);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
if (layout.Planes != 1)
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
|
|
||||||
hr = xbox.Initialize(desc, layout);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
const Image* images = &srcImage;
|
|
||||||
hr = Tile2D(&images, 1, 0, computer.Get(), xbox);
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
xbox.Release();
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
// Tile image (complex)
|
|
||||||
//-------------------------------------------------------------------------------------
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT Xbox::Tile(
|
|
||||||
const DirectX::Image* srcImages,
|
|
||||||
size_t nimages,
|
|
||||||
const DirectX::TexMetadata& metadata,
|
|
||||||
XboxImage& xbox,
|
|
||||||
XboxTileMode mode)
|
|
||||||
{
|
|
||||||
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
|
|
||||||
|| IsVideo(metadata.format))
|
|
||||||
{
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (metadata.format)
|
|
||||||
{
|
|
||||||
case DXGI_FORMAT_R32G32B32_TYPELESS:
|
|
||||||
case DXGI_FORMAT_R32G32B32_FLOAT:
|
|
||||||
case DXGI_FORMAT_R32G32B32_UINT:
|
|
||||||
case DXGI_FORMAT_R32G32B32_SINT:
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mode == c_XboxTileModeInvalid)
|
|
||||||
{
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
mode = XGComputeOptimalSwizzleMode(static_cast<XG_RESOURCE_DIMENSION>(metadata.dimension), static_cast<XG_FORMAT>(metadata.format),
|
|
||||||
static_cast<UINT>(metadata.width), static_cast<UINT>(metadata.height),
|
|
||||||
static_cast<UINT>((metadata.dimension == TEX_DIMENSION_TEXTURE3D) ? metadata.depth : metadata.arraySize),
|
|
||||||
1, XG_BIND_SHADER_RESOURCE);
|
|
||||||
#else
|
|
||||||
// If no specific tile mode is given, assume the optimal default
|
|
||||||
mode = XGComputeOptimalTileMode(static_cast<XG_RESOURCE_DIMENSION>(metadata.dimension), static_cast<XG_FORMAT>(metadata.format),
|
|
||||||
static_cast<UINT>(metadata.width), static_cast<UINT>(metadata.height),
|
|
||||||
static_cast<UINT>((metadata.dimension == TEX_DIMENSION_TEXTURE3D) ? metadata.depth : metadata.arraySize),
|
|
||||||
1, XG_BIND_SHADER_RESOURCE);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
XG_RESOURCE_LAYOUT layout = {};
|
|
||||||
|
|
||||||
switch (metadata.dimension)
|
|
||||||
{
|
|
||||||
case TEX_DIMENSION_TEXTURE1D:
|
|
||||||
{
|
|
||||||
XG_TEXTURE1D_DESC desc = {};
|
|
||||||
desc.Width = static_cast<UINT>(metadata.width);
|
|
||||||
desc.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
desc.ArraySize = static_cast<UINT>(metadata.arraySize);
|
|
||||||
desc.Format = static_cast<XG_FORMAT>(metadata.format);
|
|
||||||
desc.Usage = XG_USAGE_DEFAULT;
|
|
||||||
desc.BindFlags = XG_BIND_SHADER_RESOURCE;
|
|
||||||
desc.MiscFlags = (metadata.IsCubemap()) ? XG_RESOURCE_MISC_TEXTURECUBE : 0;
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
desc.SwizzleMode = mode;
|
|
||||||
#else
|
|
||||||
desc.TileMode = mode;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef VERBOSE
|
|
||||||
DebugPrintDesc(desc);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ComPtr<XGTextureAddressComputer> computer;
|
|
||||||
HRESULT hr = XGCreateTexture1DComputer(&desc, computer.GetAddressOf());
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
hr = computer->GetResourceLayout(&layout);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
#ifdef VERBOSE
|
|
||||||
DebugPrintLayout(layout);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (layout.Planes != 1)
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
|
|
||||||
hr = xbox.Initialize(desc, layout, metadata.miscFlags2);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
for (size_t level = 0; level < metadata.mipLevels; ++level)
|
|
||||||
{
|
|
||||||
if (metadata.arraySize > 1)
|
|
||||||
{
|
|
||||||
std::vector<const Image*> images;
|
|
||||||
images.reserve(metadata.arraySize);
|
|
||||||
for (size_t item = 0; item < metadata.arraySize; ++item)
|
|
||||||
{
|
|
||||||
const size_t index = metadata.ComputeIndex(level, item, 0);
|
|
||||||
if (index >= nimages)
|
|
||||||
{
|
|
||||||
xbox.Release();
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
images.push_back(&srcImages[index]);
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = Tile1D(&images[0], images.size(), static_cast<uint32_t>(level), computer.Get(), layout, xbox);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
const size_t index = metadata.ComputeIndex(level, 0, 0);
|
|
||||||
if (index >= nimages)
|
|
||||||
{
|
|
||||||
xbox.Release();
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
const Image* images = &srcImages[index];
|
|
||||||
hr = Tile1D(&images, 1, static_cast<uint32_t>(level), computer.Get(), layout, xbox);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
xbox.Release();
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TEX_DIMENSION_TEXTURE2D:
|
|
||||||
{
|
|
||||||
XG_TEXTURE2D_DESC desc = {};
|
|
||||||
desc.Width = static_cast<UINT>(metadata.width);
|
|
||||||
desc.Height = static_cast<UINT>(metadata.height);
|
|
||||||
desc.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
desc.ArraySize = static_cast<UINT>(metadata.arraySize);
|
|
||||||
desc.Format = static_cast<XG_FORMAT>(metadata.format);
|
|
||||||
desc.SampleDesc.Count = 1;
|
|
||||||
desc.Usage = XG_USAGE_DEFAULT;
|
|
||||||
desc.BindFlags = XG_BIND_SHADER_RESOURCE;
|
|
||||||
desc.MiscFlags = (metadata.miscFlags & TEX_MISC_TEXTURECUBE) ? XG_RESOURCE_MISC_TEXTURECUBE : 0;
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
desc.SwizzleMode = mode;
|
|
||||||
#else
|
|
||||||
desc.TileMode = mode;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef VERBOSE
|
|
||||||
DebugPrintDesc(desc);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ComPtr<XGTextureAddressComputer> computer;
|
|
||||||
HRESULT hr = XGCreateTexture2DComputer(&desc, computer.GetAddressOf());
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
hr = computer->GetResourceLayout(&layout);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
#ifdef VERBOSE
|
|
||||||
DebugPrintLayout(layout);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (layout.Planes != 1)
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
|
|
||||||
hr = xbox.Initialize(desc, layout, metadata.miscFlags2);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
for (size_t level = 0; level < metadata.mipLevels; ++level)
|
|
||||||
{
|
|
||||||
if (metadata.arraySize > 1)
|
|
||||||
{
|
|
||||||
std::vector<const Image*> images;
|
|
||||||
images.reserve(metadata.arraySize);
|
|
||||||
for (size_t item = 0; item < metadata.arraySize; ++item)
|
|
||||||
{
|
|
||||||
const size_t index = metadata.ComputeIndex(level, item, 0);
|
|
||||||
if (index >= nimages)
|
|
||||||
{
|
|
||||||
xbox.Release();
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
images.push_back(&srcImages[index]);
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = Tile2D(&images[0], images.size(), static_cast<uint32_t>(level), computer.Get(), xbox);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
const size_t index = metadata.ComputeIndex(level, 0, 0);
|
|
||||||
if (index >= nimages)
|
|
||||||
{
|
|
||||||
xbox.Release();
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
const Image* images = &srcImages[index];
|
|
||||||
hr = Tile2D(&images, 1, static_cast<uint32_t>(level), computer.Get(), xbox);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
xbox.Release();
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TEX_DIMENSION_TEXTURE3D:
|
|
||||||
{
|
|
||||||
XG_TEXTURE3D_DESC desc = {};
|
|
||||||
desc.Width = static_cast<UINT>(metadata.width);
|
|
||||||
desc.Height = static_cast<UINT>(metadata.height);
|
|
||||||
desc.Depth = static_cast<UINT>(metadata.depth);
|
|
||||||
desc.MipLevels = static_cast<UINT>(metadata.mipLevels);
|
|
||||||
desc.Format = static_cast<XG_FORMAT>(metadata.format);
|
|
||||||
desc.Usage = XG_USAGE_DEFAULT;
|
|
||||||
desc.BindFlags = XG_BIND_SHADER_RESOURCE;
|
|
||||||
#if defined(_GAMING_XBOX_SCARLETT) || defined(_USE_SCARLETT)
|
|
||||||
desc.SwizzleMode = mode;
|
|
||||||
#else
|
|
||||||
desc.TileMode = mode;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef VERBOSE
|
|
||||||
DebugPrintDesc(desc);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ComPtr<XGTextureAddressComputer> computer;
|
|
||||||
HRESULT hr = XGCreateTexture3DComputer(&desc, computer.GetAddressOf());
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
hr = computer->GetResourceLayout(&layout);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
#ifdef VERBOSE
|
|
||||||
DebugPrintLayout(layout);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (layout.Planes != 1)
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
|
|
||||||
hr = xbox.Initialize(desc, layout, metadata.miscFlags2);
|
|
||||||
if (FAILED(hr))
|
|
||||||
return hr;
|
|
||||||
|
|
||||||
auto d = static_cast<uint32_t>(metadata.depth);
|
|
||||||
|
|
||||||
size_t index = 0;
|
|
||||||
for (size_t level = 0; level < metadata.mipLevels; ++level)
|
|
||||||
{
|
|
||||||
if ((index + d) > nimages)
|
|
||||||
{
|
|
||||||
xbox.Release();
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Relies on the fact that slices are contiguous
|
|
||||||
hr = Tile3D(srcImages[index], static_cast<uint32_t>(level), computer.Get(), xbox);
|
|
||||||
if (FAILED(hr))
|
|
||||||
{
|
|
||||||
xbox.Release();
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
index += d;
|
|
||||||
|
|
||||||
if (d > 1)
|
|
||||||
d >>= 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
599
CMakeLists.txt
599
CMakeLists.txt
@ -3,9 +3,9 @@
|
|||||||
|
|
||||||
cmake_minimum_required (VERSION 3.20)
|
cmake_minimum_required (VERSION 3.20)
|
||||||
|
|
||||||
set(DIRECTXTEX_VERSION 2.0.8)
|
set(DIRECTXTEX_VERSION 1.9.9)
|
||||||
|
|
||||||
if(XBOX_CONSOLE_TARGET STREQUAL "durango")
|
if(DEFINED XBOX_CONSOLE_TARGET)
|
||||||
set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
|
set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -15,18 +15,12 @@ project (DirectXTex
|
|||||||
HOMEPAGE_URL "https://go.microsoft.com/fwlink/?LinkId=248926"
|
HOMEPAGE_URL "https://go.microsoft.com/fwlink/?LinkId=248926"
|
||||||
LANGUAGES CXX)
|
LANGUAGES CXX)
|
||||||
|
|
||||||
if(DEFINED XBOX_CONSOLE_TARGET)
|
|
||||||
set(CMAKE_CXX_STANDARD_LIBRARIES "")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
option(BUILD_TOOLS "Build tex command-line tools" ON)
|
option(BUILD_TOOLS "Build tex command-line tools" ON)
|
||||||
|
|
||||||
option(BUILD_SHARED_LIBS "Build DirectXTex as a shared library" OFF)
|
option(BUILD_SAMPLE "Build DDSView sample" ON)
|
||||||
|
|
||||||
option(BUILD_SAMPLE "Build DDSView sample (requires fxc.exe)" ON)
|
|
||||||
|
|
||||||
# Includes the functions for Direct3D 11 resources and DirectCompute compression
|
# Includes the functions for Direct3D 11 resources and DirectCompute compression
|
||||||
option(BUILD_DX11 "Build with DirectX11 Runtime support (requires fxc.exe)" ON)
|
option(BUILD_DX11 "Build with DirectX11 Runtime support" ON)
|
||||||
|
|
||||||
# Includes the functions for creating Direct3D 12 resources at runtime
|
# Includes the functions for creating Direct3D 12 resources at runtime
|
||||||
option(BUILD_DX12 "Build with DirectX12 Runtime support" ON)
|
option(BUILD_DX12 "Build with DirectX12 Runtime support" ON)
|
||||||
@ -34,10 +28,6 @@ option(BUILD_DX12 "Build with DirectX12 Runtime support" ON)
|
|||||||
# Enable the use of OpenMP for software BC6H/BC7 compression
|
# Enable the use of OpenMP for software BC6H/BC7 compression
|
||||||
option(BC_USE_OPENMP "Build with OpenMP support" ON)
|
option(BC_USE_OPENMP "Build with OpenMP support" ON)
|
||||||
|
|
||||||
# Builds Xbox extensions for Host PC
|
|
||||||
option(BUILD_XBOX_EXTS_XBOXONE "Build Xbox library extensions for Xbox One" OFF)
|
|
||||||
option(BUILD_XBOX_EXTS_SCARLETT "Build Xbox library extensions for Xbox Series X|S" OFF)
|
|
||||||
|
|
||||||
# https://devblogs.microsoft.com/cppblog/spectre-mitigations-in-msvc/
|
# https://devblogs.microsoft.com/cppblog/spectre-mitigations-in-msvc/
|
||||||
option(ENABLE_SPECTRE_MITIGATION "Build using /Qspectre for MSVC" OFF)
|
option(ENABLE_SPECTRE_MITIGATION "Build using /Qspectre for MSVC" OFF)
|
||||||
|
|
||||||
@ -45,30 +35,30 @@ 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_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(USE_PREBUILT_SHADERS "Use externally built HLSL shaders" OFF)
|
||||||
|
|
||||||
option(NO_WCHAR_T "Use legacy wide-character as unsigned short" OFF)
|
|
||||||
|
|
||||||
option(BUILD_FUZZING "Build for fuzz testing" OFF)
|
|
||||||
|
|
||||||
# Includes the functions for loading/saving OpenEXR files at runtime
|
# Includes the functions for loading/saving OpenEXR files at runtime
|
||||||
option(ENABLE_OPENEXR_SUPPORT "Build with OpenEXR support" OFF)
|
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 17)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
|
|
||||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
|
||||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
|
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
|
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()
|
||||||
|
|
||||||
if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
|
if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
|
||||||
set(BUILD_DX12 ON)
|
set(BUILD_DX12 ON)
|
||||||
@ -76,17 +66,11 @@ if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
|
|||||||
set(BUILD_SAMPLE OFF)
|
set(BUILD_SAMPLE OFF)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if((DEFINED XBOX_CONSOLE_TARGET) AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
|
if(DEFINED XBOX_CONSOLE_TARGET)
|
||||||
set(BUILD_DX11 OFF)
|
set(BUILD_DX11 OFF)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include(GNUInstallDirs)
|
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
|
#--- Library
|
||||||
set(LIBRARY_HEADERS
|
set(LIBRARY_HEADERS
|
||||||
@ -116,52 +100,17 @@ set(LIBRARY_SOURCES
|
|||||||
DirectXTex/DirectXTexUtil.cpp)
|
DirectXTex/DirectXTexUtil.cpp)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
list(APPEND LIBRARY_SOURCES
|
set(LIBRARY_SOURCES ${LIBRARY_SOURCES}
|
||||||
DirectXTex/DirectXTexFlipRotate.cpp
|
DirectXTex/DirectXTexFlipRotate.cpp
|
||||||
DirectXTex/DirectXTexWIC.cpp)
|
DirectXTex/DirectXTexWIC.cpp)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(DEFINED XBOX_CONSOLE_TARGET)
|
|
||||||
|
|
||||||
list(APPEND LIBRARY_HEADERS Auxiliary/DirectXTexXbox.h)
|
|
||||||
|
|
||||||
list(APPEND LIBRARY_SOURCES
|
|
||||||
Auxiliary/DirectXTexXboxDDS.cpp
|
|
||||||
Auxiliary/DirectXTexXboxDetile.cpp
|
|
||||||
Auxiliary/DirectXTexXboxImage.cpp
|
|
||||||
Auxiliary/DirectXTexXboxTile.cpp)
|
|
||||||
|
|
||||||
if((XBOX_CONSOLE_TARGET STREQUAL "durango") AND BUILD_DX11)
|
|
||||||
list(APPEND LIBRARY_SOURCES Auxiliary/DirectXTexXboxD3D11X.cpp)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(BUILD_DX12)
|
|
||||||
list(APPEND LIBRARY_SOURCES Auxiliary/DirectXTexXboxD3D12X.cpp)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
elseif((BUILD_XBOX_EXTS_XBOXONE OR BUILD_XBOX_EXTS_SCARLETT) AND WIN32)
|
|
||||||
if(DEFINED ENV{GameDKLatest})
|
|
||||||
cmake_path(SET GameDK_DIR "$ENV{GameDKLatest}")
|
|
||||||
endif()
|
|
||||||
if(DEFINED ENV{XboxOneXDKLatest})
|
|
||||||
cmake_path(SET XboxOneXDK_DIR "$ENV{XboxOneXDKLatest}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
list(APPEND LIBRARY_HEADERS Auxiliary/DirectXTexXbox.h)
|
|
||||||
|
|
||||||
list(APPEND LIBRARY_SOURCES
|
|
||||||
Auxiliary/DirectXTexXboxDDS.cpp
|
|
||||||
Auxiliary/DirectXTexXboxDetile.cpp
|
|
||||||
Auxiliary/DirectXTexXboxImage.cpp
|
|
||||||
Auxiliary/DirectXTexXboxTile.cpp)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(BUILD_DX11 AND WIN32 AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
|
|
||||||
set(SHADER_SOURCES
|
set(SHADER_SOURCES
|
||||||
DirectXTex/Shaders/BC6HEncode.hlsl
|
DirectXTex/Shaders/BC6HEncode.hlsl
|
||||||
DirectXTex/Shaders/BC7Encode.hlsl)
|
DirectXTex/Shaders/BC7Encode.hlsl)
|
||||||
|
|
||||||
list(APPEND LIBRARY_SOURCES
|
if(BUILD_DX11 AND WIN32)
|
||||||
|
set(LIBRARY_SOURCES ${LIBRARY_SOURCES}
|
||||||
DirectXTex/BCDirectCompute.h
|
DirectXTex/BCDirectCompute.h
|
||||||
DirectXTex/BCDirectCompute.cpp
|
DirectXTex/BCDirectCompute.cpp
|
||||||
DirectXTex/DirectXTexCompressGPU.cpp
|
DirectXTex/DirectXTexCompressGPU.cpp
|
||||||
@ -169,35 +118,20 @@ if(BUILD_DX11 AND WIN32 AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(BUILD_DX12)
|
if(BUILD_DX12)
|
||||||
list(APPEND LIBRARY_SOURCES DirectXTex/DirectXTexD3D12.cpp)
|
set(LIBRARY_SOURCES ${LIBRARY_SOURCES}
|
||||||
|
DirectXTex/d3dx12.h
|
||||||
if(NOT (DEFINED XBOX_CONSOLE_TARGET))
|
DirectXTex/DirectXTexD3D12.cpp)
|
||||||
list(APPEND LIBRARY_SOURCES Common/d3dx12.h)
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(ENABLE_OPENEXR_SUPPORT)
|
if(ENABLE_OPENEXR_SUPPORT)
|
||||||
list(APPEND LIBRARY_HEADERS Auxiliary/DirectXTexEXR.h)
|
set(LIBRARY_HEADERS ${LIBRARY_HEADERS}
|
||||||
list(APPEND LIBRARY_SOURCES Auxiliary/DirectXTexEXR.cpp)
|
Auxiliary/DirectXTexEXR.h)
|
||||||
|
|
||||||
|
set(LIBRARY_SOURCES ${LIBRARY_SOURCES}
|
||||||
|
Auxiliary/DirectXTexEXR.cpp)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(ENABLE_LIBJPEG_SUPPORT)
|
if(BUILD_DX11 AND WIN32)
|
||||||
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(NOT COMPILED_SHADERS)
|
||||||
if(USE_PREBUILT_SHADERS)
|
if(USE_PREBUILT_SHADERS)
|
||||||
message(FATAL_ERROR "ERROR: Using prebuilt shaders requires the COMPILED_SHADERS variable is set")
|
message(FATAL_ERROR "ERROR: Using prebuilt shaders requires the COMPILED_SHADERS variable is set")
|
||||||
@ -208,46 +142,22 @@ if(BUILD_DX11 AND WIN32 AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
|
|||||||
file(TO_CMAKE_PATH ${COMPILED_SHADERS} COMPILED_SHADERS)
|
file(TO_CMAKE_PATH ${COMPILED_SHADERS} COMPILED_SHADERS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
list(APPEND LIBRARY_SOURCES ${COMPILED_SHADERS}/BC6HEncode_EncodeBlockCS.inc)
|
set(LIBRARY_SOURCES ${LIBRARY_SOURCES}
|
||||||
|
${COMPILED_SHADERS}/BC6HEncode_EncodeBlockCS.inc)
|
||||||
|
|
||||||
if(NOT USE_PREBUILT_SHADERS)
|
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(
|
add_custom_command(
|
||||||
OUTPUT "${COMPILED_SHADERS}/BC6HEncode_EncodeBlockCS.inc"
|
OUTPUT "${COMPILED_SHADERS}/BC6HEncode_EncodeBlockCS.inc"
|
||||||
MAIN_DEPENDENCY "${PROJECT_SOURCE_DIR}/DirectXTex/Shaders/CompileShaders.cmd"
|
MAIN_DEPENDENCY "${PROJECT_SOURCE_DIR}/DirectXTex/Shaders/CompileShaders.cmd"
|
||||||
DEPENDS ${SHADER_SOURCES}
|
DEPENDS ${SHADER_SOURCES}
|
||||||
COMMENT "Generating HLSL shaders..."
|
COMMENT "Generating HLSL shaders..."
|
||||||
COMMAND ${CMAKE_COMMAND} -E env CompileShadersOutput="${COMPILED_SHADERS}" $<$<BOOL:${DIRECTX_FXC_TOOL}>:LegacyShaderCompiler=${DIRECTX_FXC_TOOL}> CompileShaders.cmd > "${COMPILED_SHADERS}/compileshaders.log"
|
COMMAND ${CMAKE_COMMAND} -E env CompileShadersOutput="${COMPILED_SHADERS}" CompileShaders.cmd > "${COMPILED_SHADERS}/compileshaders.log"
|
||||||
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/DirectXTex/Shaders"
|
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/DirectXTex/Shaders"
|
||||||
USES_TERMINAL)
|
USES_TERMINAL)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WIN32 AND BUILD_SHARED_LIBS)
|
add_library(${PROJECT_NAME} STATIC ${LIBRARY_SOURCES} ${LIBRARY_HEADERS})
|
||||||
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)
|
if(BUILD_DX11 AND WIN32)
|
||||||
target_include_directories(${PROJECT_NAME} PRIVATE ${COMPILED_SHADERS})
|
target_include_directories(${PROJECT_NAME} PRIVATE ${COMPILED_SHADERS})
|
||||||
@ -275,79 +185,13 @@ if(ENABLE_OPENEXR_SUPPORT)
|
|||||||
target_link_libraries(${PROJECT_NAME} PUBLIC OpenEXR::OpenEXR)
|
target_link_libraries(${PROJECT_NAME} PUBLIC OpenEXR::OpenEXR)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(BUILD_XBOX_EXTS_SCARLETT AND WIN32)
|
|
||||||
if(EXISTS "${GameDK_DIR}/GXDK/toolKit/include/gxdk.h")
|
|
||||||
message(STATUS "Building Xbox extensions for Xbox Series X|S")
|
|
||||||
|
|
||||||
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")
|
|
||||||
message(STATUS "Building Xbox extensions for XboxOne using the Microsoft GDK")
|
|
||||||
|
|
||||||
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")
|
|
||||||
|
|
||||||
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)
|
if(NOT MINGW)
|
||||||
target_precompile_headers(${PROJECT_NAME} PRIVATE DirectXTex/DirectXTexP.h)
|
target_precompile_headers(${PROJECT_NAME} PRIVATE DirectXTex/DirectXTexP.h)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MINGW OR (NOT WIN32))
|
if(MINGW OR (NOT WIN32))
|
||||||
find_package(directxmath CONFIG REQUIRED)
|
find_package(directxmath CONFIG REQUIRED)
|
||||||
target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectXMath)
|
|
||||||
|
|
||||||
find_package(directx-headers CONFIG REQUIRED)
|
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()
|
else()
|
||||||
find_package(directxmath CONFIG QUIET)
|
find_package(directxmath CONFIG QUIET)
|
||||||
find_package(directx-headers CONFIG QUIET)
|
find_package(directx-headers CONFIG QUIET)
|
||||||
@ -355,14 +199,50 @@ endif()
|
|||||||
|
|
||||||
if(directxmath_FOUND)
|
if(directxmath_FOUND)
|
||||||
message(STATUS "Using DirectXMath package")
|
message(STATUS "Using DirectXMath package")
|
||||||
target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectXMath)
|
target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectXMath)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(directx-headers_FOUND)
|
if(directx-headers_FOUND)
|
||||||
message(STATUS "Using DirectX-Headers package")
|
message(STATUS "Using DirectX-Headers package")
|
||||||
target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectX-Headers)
|
target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectX-Headers)
|
||||||
target_compile_definitions(${PROJECT_NAME} PRIVATE USING_DIRECTX_HEADERS)
|
target_compile_definitions(${PROJECT_NAME} PUBLIC USING_DIRECTX_HEADERS)
|
||||||
target_compile_options(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC,Intel>:/wd4062> $<$<CXX_COMPILER_ID:Clang,IntelLLVM>:-Wno-switch-enum>)
|
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)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#--- Package
|
#--- Package
|
||||||
@ -398,145 +278,77 @@ install(FILES
|
|||||||
${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake
|
${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake
|
||||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME})
|
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME})
|
||||||
|
|
||||||
# Create pkg-config file
|
|
||||||
include(build/JoinPaths.cmake)
|
|
||||||
# from: https://github.com/jtojnar/cmake-snips#concatenating-paths-when-building-pkg-config-files
|
|
||||||
join_paths(DIRECTXTEX_INCLUDEDIR_FOR_PKG_CONFIG "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
|
|
||||||
join_paths(DIRECTXTEX_LIBDIR_FOR_PKG_CONFIG "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
|
|
||||||
|
|
||||||
set(DIRECTXTEX_DEP_L "")
|
|
||||||
if(ENABLE_OPENEXR_SUPPORT)
|
|
||||||
list(APPEND DIRECTXTEX_DEP_L "OpenEXR")
|
|
||||||
endif()
|
|
||||||
if(directxmath_FOUND)
|
|
||||||
list(APPEND DIRECTXTEX_DEP_L "DirectXMath")
|
|
||||||
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}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
configure_file(
|
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/build/DirectXTex.pc.in"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/DirectXTex.pc" @ONLY)
|
|
||||||
|
|
||||||
# Install the pkg-config file
|
|
||||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/DirectXTex.pc"
|
|
||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
|
||||||
|
|
||||||
#--- Command-line tools
|
#--- Command-line tools
|
||||||
set(TOOL_EXES "")
|
if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
|
||||||
|
set(TOOL_EXES texassemble texconv texdiag)
|
||||||
|
|
||||||
if(BUILD_TOOLS AND WIN32)
|
|
||||||
add_executable(texassemble
|
add_executable(texassemble
|
||||||
Texassemble/texassemble.cpp
|
Texassemble/texassemble.cpp
|
||||||
Texassemble/texassemble.rc
|
Texassemble/texassemble.rc
|
||||||
Common/CmdLineHelpers.h
|
Texassemble/settings.manifest
|
||||||
Common/settings.manifest
|
|
||||||
Texassemble/AnimatedGif.cpp)
|
Texassemble/AnimatedGif.cpp)
|
||||||
target_compile_features(texassemble PRIVATE cxx_std_17)
|
|
||||||
target_link_libraries(texassemble PRIVATE ${PROJECT_NAME} ole32.lib version.lib)
|
target_link_libraries(texassemble PRIVATE ${PROJECT_NAME} ole32.lib version.lib)
|
||||||
source_group(texassemble REGULAR_EXPRESSION Texassemble/*.*)
|
source_group(texassemble REGULAR_EXPRESSION Texassemble/*.*)
|
||||||
list(APPEND TOOL_EXES texassemble)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
|
|
||||||
add_executable(texconv
|
add_executable(texconv
|
||||||
Texconv/texconv.cpp
|
Texconv/texconv.cpp
|
||||||
Texconv/texconv.rc
|
Texconv/texconv.rc
|
||||||
Common/CmdLineHelpers.h
|
Texconv/settings.manifest
|
||||||
Common/settings.manifest
|
|
||||||
Texconv/ExtendedBMP.cpp
|
Texconv/ExtendedBMP.cpp
|
||||||
Texconv/PortablePixMap.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)
|
target_link_libraries(texconv PRIVATE ${PROJECT_NAME} ole32.lib shell32.lib version.lib)
|
||||||
source_group(texconv REGULAR_EXPRESSION Texconv/*.*)
|
source_group(texconv REGULAR_EXPRESSION Texconv/*.*)
|
||||||
list(APPEND TOOL_EXES texconv)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(BUILD_TOOLS AND WIN32)
|
|
||||||
add_executable(texdiag
|
add_executable(texdiag
|
||||||
Texdiag/texdiag.cpp
|
Texdiag/texdiag.cpp
|
||||||
Texdiag/texdiag.rc
|
Texdiag/texdiag.rc
|
||||||
Common/CmdLineHelpers.h
|
Texdiag/settings.manifest)
|
||||||
Common/settings.manifest)
|
|
||||||
target_compile_features(texdiag PRIVATE cxx_std_17)
|
|
||||||
target_link_libraries(texdiag PRIVATE ${PROJECT_NAME} ole32.lib version.lib)
|
target_link_libraries(texdiag PRIVATE ${PROJECT_NAME} ole32.lib version.lib)
|
||||||
source_group(texdiag REGULAR_EXPRESSION Texdiag/*.*)
|
source_group(texdiag REGULAR_EXPRESSION Texdiag/*.*)
|
||||||
list(APPEND TOOL_EXES texdiag)
|
|
||||||
|
if(BC_USE_OPENMP)
|
||||||
|
target_link_libraries(texconv PRIVATE OpenMP::OpenMP_CXX)
|
||||||
endif()
|
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)
|
if(ENABLE_OPENEXR_SUPPORT)
|
||||||
foreach(t IN LISTS TOOL_EXES)
|
foreach(t IN LISTS TOOL_EXES)
|
||||||
target_include_directories(${t} PRIVATE Auxiliary)
|
target_include_directories(${t} PRIVATE Auxiliary)
|
||||||
target_link_libraries(${t} PRIVATE ${OPENEXR_ILMIMF_LIBRARY})
|
target_link_libraries(${t} PRIVATE ${OPENEXR_ILMIMF_LIBRARY})
|
||||||
target_compile_definitions(${t} PRIVATE USE_OPENEXR)
|
target_compile_options(${t} PRIVATE -DUSE_OPENEXR)
|
||||||
endforeach()
|
endforeach()
|
||||||
endif()
|
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()
|
endif()
|
||||||
|
|
||||||
#--- DDSView sample
|
#--- DDSView sample
|
||||||
if(BUILD_SAMPLE AND BUILD_DX11 AND WIN32)
|
if(BUILD_SAMPLE AND BUILD_DX11 AND WIN32)
|
||||||
list(APPEND TOOL_EXES ddsview)
|
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
|
add_executable(ddsview WIN32
|
||||||
DDSView/ddsview.cpp
|
DDSView/ddsview.cpp
|
||||||
DDSView/ddsview.rc
|
DDSView/ddsview.rc
|
||||||
${COMPILED_SHADERS}/ddsview_ps1D.inc)
|
${COMPILED_DDSVIEW_SHADERS}/ddsview_ps1D.inc)
|
||||||
target_link_libraries(ddsview PRIVATE ${PROJECT_NAME} d3d11.lib ole32.lib)
|
target_link_libraries(ddsview PRIVATE ${PROJECT_NAME} d3d11.lib ole32.lib)
|
||||||
source_group(ddsview REGULAR_EXPRESSION DDSView/*.*)
|
source_group(ddsview REGULAR_EXPRESSION DDSView/*.*)
|
||||||
|
|
||||||
target_include_directories(ddsview PRIVATE ${COMPILED_SHADERS})
|
target_include_directories(ddsview PRIVATE ${COMPILED_DDSVIEW_SHADERS})
|
||||||
|
|
||||||
if(NOT USE_PREBUILT_SHADERS)
|
if(NOT USE_PREBUILT_SHADERS)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "${COMPILED_SHADERS}/ddsview_ps1D.inc"
|
OUTPUT "${COMPILED_DDSVIEW_SHADERS}/ddsview_ps1D.inc"
|
||||||
MAIN_DEPENDENCY "${PROJECT_SOURCE_DIR}/DDSView/hlsl.cmd"
|
MAIN_DEPENDENCY "${PROJECT_SOURCE_DIR}/DDSView/hlsl.cmd"
|
||||||
DEPENDS "DDSView/ddsview.hlsl"
|
DEPENDS "${PROJECT_SOURCE_DIR}/DDSView/ddsview.fx"
|
||||||
COMMENT "Generating HLSL shaders for DDSView..."
|
COMMENT "Generating HLSL shaders for DDSView..."
|
||||||
COMMAND ${CMAKE_COMMAND} -E env CompileShadersOutput="${COMPILED_SHADERS}" $<$<BOOL:${DIRECTX_FXC_TOOL}>:LegacyShaderCompiler=${DIRECTX_FXC_TOOL}> hlsl.cmd > "${COMPILED_SHADERS}/hlsl_ddsview.log"
|
COMMAND COMMAND ${CMAKE_COMMAND} -E env CompileShadersOutput="${COMPILED_DDSVIEW_SHADERS}" hlsl.cmd > "${COMPILED_DDSVIEW_SHADERS}/hlsl.log"
|
||||||
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/DDSView"
|
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/DDSView"
|
||||||
USES_TERMINAL)
|
USES_TERMINAL)
|
||||||
endif()
|
endif()
|
||||||
@ -548,110 +360,140 @@ if(directxmath_FOUND)
|
|||||||
endforeach()
|
endforeach()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(TOOL_EXES)
|
|
||||||
message(STATUS "Building tools: ${TOOL_EXES}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
||||||
target_compile_options(${t} PRIVATE /Wall /GR-)
|
target_compile_options(${t} PRIVATE /Wall /GR- /fp:fast "$<$<NOT:$<CONFIG:DEBUG>>:/guard:cf>")
|
||||||
|
target_link_options(${t} PRIVATE /DYNAMICBASE /NXCOMPAT)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
if(NO_WCHAR_T)
|
if((CMAKE_SIZEOF_VOID_P EQUAL 4) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
|
||||||
message(STATUS "Using non-native wchar_t as unsigned short")
|
|
||||||
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
||||||
target_compile_options(${t} PRIVATE "/Zc:wchar_t-")
|
target_link_options(${t} PRIVATE /SAFESEH)
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
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()
|
|
||||||
|
|
||||||
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)
|
|
||||||
list(APPEND WarningsLib "-Wno-microsoft-enum-value" "-Wno-non-virtual-dtor" "-Wno-ignored-pragmas" "-Wno-deprecated-dynamic-exception-spec")
|
|
||||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
|
|
||||||
list(APPEND WarningsLib "-Wno-reserved-identifier")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
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-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" "-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")
|
|
||||||
|
|
||||||
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 /WX)
|
|
||||||
endforeach()
|
endforeach()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(ENABLE_SPECTRE_MITIGATION
|
if(ENABLE_SPECTRE_MITIGATION
|
||||||
AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.13)
|
AND (MSVC_VERSION GREATER_EQUAL 1913)
|
||||||
|
AND (NOT WINDOWS_STORE)
|
||||||
AND (NOT ENABLE_OPENEXR_SUPPORT)
|
AND (NOT ENABLE_OPENEXR_SUPPORT)
|
||||||
AND (NOT WINDOWS_STORE))
|
AND (NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")))
|
||||||
message(STATUS "Building Spectre-mitigated libraries")
|
message(STATUS "Building Spectre-mitigated libraries")
|
||||||
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
||||||
target_compile_options(${t} PRIVATE "/Qspectre")
|
target_compile_options(${t} PRIVATE "/Qspectre")
|
||||||
endforeach()
|
endforeach()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
|
if((MSVC_VERSION GREATER_EQUAL 1924)
|
||||||
AND BUILD_XBOX_EXTS_XBOXONE)
|
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})
|
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
||||||
target_compile_options(${t} PRIVATE /wd5104 /wd5204)
|
target_compile_options(${t} PRIVATE /ZH:SHA_256)
|
||||||
endforeach()
|
endforeach()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(WarningsEXE "/wd4061" "/wd4062" "/wd4365" "/wd4514" "/wd4571" "/wd4625" "/wd4626" "/wd4627" "/wd4668" "/wd4710" "/wd4711" "/wd4751" "/wd4774" "/wd4820" "/wd5026" "/wd5027" "/wd5039" "/wd5045" "/wd5219")
|
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()
|
||||||
|
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_options(${t} PRIVATE ${ARCH_SSE2})
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
|
set(WarningsLib -Wall -Wpedantic -Wextra)
|
||||||
|
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")
|
||||||
|
foreach(t IN LISTS TOOL_EXES)
|
||||||
|
target_compile_options(${t} PRIVATE ${WarningsEXE})
|
||||||
|
endforeach()
|
||||||
|
elseif(MINGW)
|
||||||
|
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
||||||
|
target_compile_options(${t} PRIVATE -Wno-ignored-attributes)
|
||||||
|
target_link_options(${t} PRIVATE -municode)
|
||||||
|
endforeach()
|
||||||
|
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(ENABLE_CODE_ANALYSIS)
|
||||||
|
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
||||||
|
target_compile_options(${t} PRIVATE /analyze)
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
|
||||||
|
message(STATUS "Building using Whole Program Optimization")
|
||||||
|
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
||||||
|
target_compile_options(${t} PRIVATE /Gy /Gw)
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
|
||||||
|
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
||||||
|
target_compile_options(${t} PRIVATE /Zc:preprocessor /wd5105)
|
||||||
|
endforeach()
|
||||||
|
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)
|
||||||
|
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" "/wd4751" "/wd4820" "/wd5026" "/wd5027" "/wd5039" "/wd5045" "/wd5219")
|
||||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34)
|
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34)
|
||||||
list(APPEND WarningsEXE "/wd5262" "/wd5264")
|
list(APPEND WarningsEXE "/wd5262" "/wd5264")
|
||||||
endif()
|
endif()
|
||||||
foreach(t IN LISTS TOOL_EXES)
|
foreach(t IN LISTS TOOL_EXES)
|
||||||
target_compile_options(${t} PRIVATE ${WarningsEXE})
|
target_compile_options(${t} PRIVATE ${WarningsEXE})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
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 ${ASAN_SWITCHES})
|
|
||||||
target_link_libraries(${t} PRIVATE ${ASAN_LIBS})
|
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
@ -663,12 +505,13 @@ if(WIN32)
|
|||||||
elseif(${DIRECTX_ARCH} MATCHES "^arm")
|
elseif(${DIRECTX_ARCH} MATCHES "^arm")
|
||||||
set(WINVER 0x0602)
|
set(WINVER 0x0602)
|
||||||
else()
|
else()
|
||||||
message(STATUS "Building with Windows 8.1 compatibility")
|
message(STATUS "Building with Windows 7 compatibility")
|
||||||
set(WINVER 0x0603)
|
set(WINVER 0x0601)
|
||||||
|
target_compile_definitions(${PROJECT_NAME} PRIVATE _WIN7_PLATFORM_UPDATE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
||||||
target_compile_definitions(${t} PRIVATE _WIN32_WINNT=${WINVER})
|
target_compile_definitions(${t} PRIVATE _UNICODE UNICODE _WIN32_WINNT=${WINVER})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
if(DISABLE_MSVC_ITERATOR_DEBUGGING)
|
if(DISABLE_MSVC_ITERATOR_DEBUGGING)
|
||||||
@ -682,24 +525,10 @@ if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
|
|||||||
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT texconv)
|
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT texconv)
|
||||||
endif()
|
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
|
#--- Test suite
|
||||||
if(WIN32 AND (NOT WINDOWS_STORE) AND (NOT (DEFINED XBOX_CONSOLE_TARGET)))
|
|
||||||
include(CTest)
|
include(CTest)
|
||||||
if(BUILD_TESTING AND (EXISTS "${CMAKE_CURRENT_LIST_DIR}/Tests/CMakeLists.txt"))
|
if(BUILD_TESTING AND WIN32 AND (NOT WINDOWS_STORE) AND (NOT (DEFINED XBOX_CONSOLE_TARGET))
|
||||||
|
AND (EXISTS "${CMAKE_CURRENT_LIST_DIR}/Tests/CMakeLists.txt"))
|
||||||
enable_testing()
|
enable_testing()
|
||||||
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Tests)
|
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Tests)
|
||||||
|
|
||||||
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()
|
endif()
|
||||||
|
|||||||
@ -29,6 +29,15 @@
|
|||||||
"cacheVariables": { "DIRECTX_ARCH": "x86" },
|
"cacheVariables": { "DIRECTX_ARCH": "x86" },
|
||||||
"hidden": true
|
"hidden": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "ARM",
|
||||||
|
"architecture": {
|
||||||
|
"value": "arm",
|
||||||
|
"strategy": "external"
|
||||||
|
},
|
||||||
|
"cacheVariables": { "DIRECTX_ARCH": "arm" },
|
||||||
|
"hidden": true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "ARM64",
|
"name": "ARM64",
|
||||||
"architecture": {
|
"architecture": {
|
||||||
@ -38,19 +47,6 @@
|
|||||||
"cacheVariables": { "DIRECTX_ARCH": "arm64" },
|
"cacheVariables": { "DIRECTX_ARCH": "arm64" },
|
||||||
"hidden": true
|
"hidden": true
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "ARM64EC",
|
|
||||||
"architecture": {
|
|
||||||
"value": "arm64ec",
|
|
||||||
"strategy": "external"
|
|
||||||
},
|
|
||||||
"cacheVariables": { "DIRECTX_ARCH": "arm64ec" },
|
|
||||||
"environment": {
|
|
||||||
"CFLAGS": "/arm64EC",
|
|
||||||
"CXXFLAGS": "/arm64EC"
|
|
||||||
},
|
|
||||||
"hidden": true
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "Debug",
|
"name": "Debug",
|
||||||
@ -89,22 +85,6 @@
|
|||||||
"strategy": "external"
|
"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",
|
"name": "GNUC",
|
||||||
"hidden": true,
|
"hidden": true,
|
||||||
@ -118,39 +98,12 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "Win8",
|
"name": "Win7",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"BUILD_DX12": false
|
"BUILD_DX12": false
|
||||||
},
|
},
|
||||||
"hidden": true
|
"hidden": true
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "GDKX",
|
|
||||||
"cacheVariables": {
|
|
||||||
"BUILD_XBOX_EXTS_XBOXONE": true
|
|
||||||
},
|
|
||||||
"environment": {
|
|
||||||
"XboxOneXDKLatest": ""
|
|
||||||
},
|
|
||||||
"hidden": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "GDKXS",
|
|
||||||
"cacheVariables": {
|
|
||||||
"BUILD_XBOX_EXTS_SCARLETT": true
|
|
||||||
},
|
|
||||||
"hidden": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "XDK",
|
|
||||||
"cacheVariables": {
|
|
||||||
"BUILD_XBOX_EXTS_XBOXONE": true
|
|
||||||
},
|
|
||||||
"environment": {
|
|
||||||
"GameDKLatest": ""
|
|
||||||
},
|
|
||||||
"hidden": true
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "UWP",
|
"name": "UWP",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
@ -163,21 +116,24 @@
|
|||||||
{
|
{
|
||||||
"name": "Scarlett",
|
"name": "Scarlett",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"XBOX_CONSOLE_TARGET": "scarlett"
|
"XBOX_CONSOLE_TARGET": "scarlett",
|
||||||
|
"BUILD_TESTING": false
|
||||||
},
|
},
|
||||||
"hidden": true
|
"hidden": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "XboxOne",
|
"name": "XboxOne",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"XBOX_CONSOLE_TARGET": "xboxone"
|
"XBOX_CONSOLE_TARGET": "xboxone",
|
||||||
|
"BUILD_TESTING": false
|
||||||
},
|
},
|
||||||
"hidden": true
|
"hidden": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Durango",
|
"name": "Durango",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"XBOX_CONSOLE_TARGET": "durango"
|
"XBOX_CONSOLE_TARGET": "durango",
|
||||||
|
"BUILD_TESTING": false
|
||||||
},
|
},
|
||||||
"hidden": true
|
"hidden": true
|
||||||
},
|
},
|
||||||
@ -198,14 +154,6 @@
|
|||||||
},
|
},
|
||||||
"hidden": true
|
"hidden": true
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "JPEG_PNG",
|
|
||||||
"cacheVariables": {
|
|
||||||
"ENABLE_LIBJPEG_SUPPORT": true,
|
|
||||||
"ENABLE_LIBPNG_SUPPORT": true
|
|
||||||
},
|
|
||||||
"hidden": true
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "MinGW32",
|
"name": "MinGW32",
|
||||||
"hidden": true,
|
"hidden": true,
|
||||||
@ -214,7 +162,7 @@
|
|||||||
},
|
},
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"VCPKG_TARGET_TRIPLET": "x86-mingw-static",
|
"VCPKG_TARGET_TRIPLET": "x86-mingw-static",
|
||||||
"VCPKG_HOST_TRIPLET": "x64-windows"
|
"VCPKG_HOST_TRIPLET": "x86-mingw-static"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -225,58 +173,9 @@
|
|||||||
},
|
},
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"VCPKG_TARGET_TRIPLET": "x64-mingw-static",
|
"VCPKG_TARGET_TRIPLET": "x64-mingw-static",
|
||||||
"VCPKG_HOST_TRIPLET": "x64-windows"
|
"VCPKG_HOST_TRIPLET": "x64-mingw-static"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"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": {
|
|
||||||
"BUILD_FUZZING": true,
|
|
||||||
"BUILD_TESTING": false
|
|
||||||
},
|
|
||||||
"hidden": true
|
|
||||||
},
|
|
||||||
|
|
||||||
{ "name": "x64-Debug" , "description": "MSVC for x64 (Debug) with DX12", "inherits": [ "base", "x64", "Debug", "MSVC" ] },
|
{ "name": "x64-Debug" , "description": "MSVC for x64 (Debug) with DX12", "inherits": [ "base", "x64", "Debug", "MSVC" ] },
|
||||||
{ "name": "x64-Release" , "description": "MSVC for x64 (Release) with DX12", "inherits": [ "base", "x64", "Release", "MSVC" ] },
|
{ "name": "x64-Release" , "description": "MSVC for x64 (Release) with DX12", "inherits": [ "base", "x64", "Release", "MSVC" ] },
|
||||||
@ -284,20 +183,20 @@
|
|||||||
{ "name": "x86-Release" , "description": "MSVC for x86 (Release) with DX12", "inherits": [ "base", "x86", "Release", "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-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-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" ] },
|
{ "name": "x64-Release-UWP" , "description": "MSVC for x64 (Release) for UWP", "inherits": [ "base", "x64", "Release", "MSVC", "UWP" ] },
|
||||||
{ "name": "x86-Debug-UWP" , "description": "MSVC for x86 (Debug) for UWP", "inherits": [ "base", "x86", "Debug", "MSVC", "UWP" ] },
|
{ "name": "x86-Debug-UWP" , "description": "MSVC for x86 (Debug) for UWP", "inherits": [ "base", "x86", "Debug", "MSVC", "UWP" ] },
|
||||||
{ "name": "x86-Release-UWP" , "description": "MSVC for x86 (Release) for UWP", "inherits": [ "base", "x86", "Release", "MSVC", "UWP" ] },
|
{ "name": "x86-Release-UWP" , "description": "MSVC for x86 (Release) for UWP", "inherits": [ "base", "x86", "Release", "MSVC", "UWP" ] },
|
||||||
|
{ "name": "arm-Debug-UWP" , "description": "MSVC for ARM (Debug) for UWP", "inherits": [ "base", "ARM", "Debug", "MSVC", "UWP" ] },
|
||||||
|
{ "name": "arm-Release-UWP" , "description": "MSVC for ARM (Release) for UWP", "inherits": [ "base", "ARM", "Release", "MSVC", "UWP" ] },
|
||||||
{ "name": "arm64-Debug-UWP" , "description": "MSVC for ARM64 (Debug) for UWP", "inherits": [ "base", "ARM64", "Debug", "MSVC", "UWP" ] },
|
{ "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": "arm64-Release-UWP", "description": "MSVC for ARM64 (Release) for UWP", "inherits": [ "base", "ARM64", "Release", "MSVC", "UWP" ] },
|
||||||
|
|
||||||
{ "name": "x64-Debug-Win8" , "description": "MSVC for x64 (Debug) for Windows 8.1", "inherits": [ "base", "x64", "Debug", "MSVC", "Win8" ] },
|
{ "name": "x64-Debug-Win7" , "description": "MSVC for x64 (Debug) for Windows 7", "inherits": [ "base", "x64", "Debug", "MSVC", "Win7" ] },
|
||||||
{ "name": "x64-Release-Win8" , "description": "MSVC for x64 (Release) for Windows 8.1", "inherits": [ "base", "x64", "Release", "MSVC", "Win8" ] },
|
{ "name": "x64-Release-Win7" , "description": "MSVC for x64 (Release) for Windows 7", "inherits": [ "base", "x64", "Release", "MSVC", "Win7" ] },
|
||||||
{ "name": "x86-Debug-Win8" , "description": "MSVC for x86 (Debug) for Windows 8.1", "inherits": [ "base", "x86", "Debug", "MSVC", "Win8" ] },
|
{ "name": "x86-Debug-Win7" , "description": "MSVC for x86 (Debug) for Windows 7", "inherits": [ "base", "x86", "Debug", "MSVC", "Win7" ] },
|
||||||
{ "name": "x86-Release-Win8" , "description": "MSVC for x86 (Release) for Windows 8.1", "inherits": [ "base", "x86", "Release", "MSVC", "Win8" ] },
|
{ "name": "x86-Release-Win7" , "description": "MSVC for x86 (Release) for Windows 7", "inherits": [ "base", "x86", "Release", "MSVC", "Win7" ] },
|
||||||
|
|
||||||
{ "name": "x64-Debug-Scarlett" , "description": "MSVC for x64 (Debug) for Xbox Series X|S", "inherits": [ "base", "x64", "Debug", "MSVC", "Scarlett" ] },
|
{ "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" ] },
|
{ "name": "x64-Release-Scarlett" , "description": "MSVC for x64 (Release) for Xbox Series X|S", "inherits": [ "base", "x64", "Release", "MSVC", "Scarlett" ] },
|
||||||
@ -314,87 +213,38 @@
|
|||||||
{ "name": "x86-Release-VCPKG" , "description": "MSVC for x86 (Release) using VCPKG", "inherits": [ "base", "x86", "Release", "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-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-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-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-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": "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", "Clang-X86" ] },
|
{ "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", "Clang-X86" ] },
|
{ "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", "Clang-AArch64" ] },
|
{ "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", "Clang-AArch64" ] },
|
{ "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": "x64-Debug-UWP-Clang" , "description": "Clang/LLVM for x64 (Debug) for UWP", "inherits": [ "base", "x64", "Debug", "Clang", "UWP" ] },
|
{ "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": "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", "Clang-X86", "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", "Clang-X86", "UWP" ] },
|
{ "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", "Clang-AArch64", "UWP" ] },
|
{ "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", "Clang-AArch64", "UWP" ] },
|
{ "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": "x64-Debug-Win8-Clang" , "description": "Clang/LLVM for x64 (Debug) for Windows 8.1", "inherits": [ "base", "x64", "Debug", "Clang", "Win8" ] },
|
{ "name": "x64-Debug-Win7-Clang" , "description": "Clang/LLVM for x64 (Debug) for Windows 7", "inherits": [ "base", "x64", "Debug", "Clang", "Win7" ] },
|
||||||
{ "name": "x64-Release-Win8-Clang", "description": "Clang/LLVM for x64 (Release) for Windows 8.1", "inherits": [ "base", "x64", "Release", "Clang", "Win8" ] },
|
{ "name": "x64-Release-Win7-Clang", "description": "Clang/LLVM for x64 (Release) for Windows 7", "inherits": [ "base", "x64", "Release", "Clang", "Win7" ] },
|
||||||
{ "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-Debug-Win7-Clang" , "description": "Clang/LLVM for x86 (Debug) for Windows 7", "inherits": [ "base", "x86", "Debug", "Clang", "Win7" ], "environment": { "CXXFLAGS": "-m32" } },
|
||||||
{ "name": "x86-Release-Win8-Clang", "description": "Clang/LLVM for x86 (Release) for Windows 8.1", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86", "Win8" ] },
|
{ "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-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" ] },
|
|
||||||
{ "name": "x64-Debug-GDKX-S" , "description": "MSVC for x64 (Debug) Xbox Series X|S Extensions", "inherits": [ "base", "x64", "Debug", "GDKXS", "MSVC" ] },
|
|
||||||
{ "name": "x64-Release-GDKX-S" , "description": "MSVC for x64 (Release) Xbox Series X|S Extensions", "inherits": [ "base", "x64", "Release", "GDKXS", "MSVC" ] },
|
|
||||||
{ "name": "x64-Debug-XDK" , "description": "MSVC for x64 (Debug) Xbox One Extensions (legacy)", "inherits": [ "base", "x64", "Debug", "XDK", "MSVC" ] },
|
|
||||||
{ "name": "x64-Release-XDK" , "description": "MSVC for x64 (Release) Xbox One Extensions (legacy)", "inherits": [ "base", "x64", "Release", "XDK", "MSVC" ] },
|
|
||||||
|
|
||||||
{ "name": "x64-Debug-GDKX-Clang" , "description": "MSVC for x64 (Debug) Xbox One Extensions", "inherits": [ "base", "x64", "Debug", "GDKX", "Clang" ] },
|
|
||||||
{ "name": "x64-Release-GDKX-Clang" , "description": "MSVC for x64 (Release) Xbox One Extensions", "inherits": [ "base", "x64", "Release", "GDKX", "Clang" ] },
|
|
||||||
{ "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-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": "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-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": "x86-Release-MinGW", "description": "MinG-W32 (Release)", "inherits": [ "base", "x86", "Release", "GNUC", "VCPKG", "MinGW32" ] },
|
||||||
|
|
||||||
{ "name": "x64-Debug-MinGW-JPEG-PNG" , "description": "MinG-W64 (Debug)", "inherits": [ "base", "x64", "Debug", "GNUC", "VCPKG", "MinGW64", "JPEG_PNG" ] },
|
{ "name": "x64-Debug-Linux", "description": "WSL Linux x64 (Debug)", "inherits": [ "base", "x64", "Debug", "VCPKG" ] },
|
||||||
{ "name": "x64-Release-MinGW-JPEG-PNG", "description": "MinG-W64 (Release)", "inherits": [ "base", "x64", "Release", "GNUC", "VCPKG", "MinGW64", "JPEG_PNG" ] },
|
{ "name": "x64-Release-Linux", "description": "WSL Linux x64 (Release)", "inherits": [ "base", "x64", "Release", "VCPKG" ] },
|
||||||
{ "name": "x86-Debug-MinGW-JPEG-PNG" , "description": "MinG-W32 (Debug)", "inherits": [ "base", "x86", "Debug", "GNUC", "VCPKG", "MinGW32", "JPEG_PNG" ] },
|
{ "name": "arm64-Debug-Linux", "description": "WSL Linux ARM64 (Debug)", "inherits": [ "base", "ARM64", "Debug", "VCPKG" ] },
|
||||||
{ "name": "x86-Release-MinGW-JPEG-PNG", "description": "MinG-W32 (Release)", "inherits": [ "base", "x86", "Release", "GNUC", "VCPKG", "MinGW32", "JPEG_PNG" ] },
|
{ "name": "arm64-Release-Linux", "description": "WSL Linux ARM64 (Release)", "inherits": [ "base", "ARM64", "Release", "VCPKG" ] }
|
||||||
|
|
||||||
{ "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": [
|
"testPresets": [
|
||||||
{ "name": "x64-Debug" , "configurePreset": "x64-Debug" },
|
{ "name": "x64-Debug" , "configurePreset": "x64-Debug" },
|
||||||
@ -403,17 +253,6 @@
|
|||||||
{ "name": "x86-Release" , "configurePreset": "x86-Release" },
|
{ "name": "x86-Release" , "configurePreset": "x86-Release" },
|
||||||
{ "name": "arm64-Debug" , "configurePreset": "arm64-Debug" },
|
{ "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-Debug-Clang" , "configurePreset": "x64-Debug-Clang" },
|
||||||
{ "name": "x64-Release-Clang" , "configurePreset": "x64-Release-Clang" },
|
{ "name": "x64-Release-Clang" , "configurePreset": "x64-Release-Clang" },
|
||||||
@ -422,23 +261,9 @@
|
|||||||
{ "name": "arm64-Debug-Clang" , "configurePreset": "arm64-Debug-Clang" },
|
{ "name": "arm64-Debug-Clang" , "configurePreset": "arm64-Debug-Clang" },
|
||||||
{ "name": "arm64-Release-Clang", "configurePreset": "arm64-Release-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-Debug-MinGW" , "configurePreset": "x64-Debug-MinGW" },
|
||||||
{ "name": "x64-Release-MinGW" , "configurePreset": "x64-Release-MinGW" },
|
{ "name": "x64-Release-MinGW" , "configurePreset": "x64-Release-MinGW" },
|
||||||
{ "name": "x86-Debug-MinGW" , "configurePreset": "x86-Debug-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"}
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -1,10 +0,0 @@
|
|||||||
# 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)
|
|
||||||
@ -1,375 +0,0 @@
|
|||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cstdint>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <new>
|
#include <new>
|
||||||
|
|
||||||
@ -54,8 +53,6 @@ using namespace DirectX;
|
|||||||
//
|
//
|
||||||
// See DDS.h in the 'Texconv' sample and the 'DirectXTex' library
|
// See DDS.h in the 'Texconv' sample and the 'DirectXTex' library
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
namespace
|
|
||||||
{
|
|
||||||
#pragma pack(push,1)
|
#pragma pack(push,1)
|
||||||
|
|
||||||
constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
|
constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
|
||||||
@ -129,15 +126,9 @@ namespace
|
|||||||
|
|
||||||
#pragma pack(pop)
|
#pragma pack(pop)
|
||||||
|
|
||||||
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");
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
|
namespace
|
||||||
|
{
|
||||||
struct handle_closer { void operator()(HANDLE h) noexcept { if (h) CloseHandle(h); } };
|
struct handle_closer { void operator()(HANDLE h) noexcept { if (h) CloseHandle(h); } };
|
||||||
|
|
||||||
using ScopedHandle = std::unique_ptr<void, handle_closer>;
|
using ScopedHandle = std::unique_ptr<void, handle_closer>;
|
||||||
@ -153,7 +144,8 @@ namespace
|
|||||||
#else
|
#else
|
||||||
template<UINT TNameLength>
|
template<UINT TNameLength>
|
||||||
inline void SetDebugObjectName(_In_ ID3D11DeviceChild*, _In_ const char(&)[TNameLength]) noexcept
|
inline void SetDebugObjectName(_In_ ID3D11DeviceChild*, _In_ const char(&)[TNameLength]) noexcept
|
||||||
{}
|
{
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
@ -176,13 +168,13 @@ namespace
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ddsDataSize < DDS_MIN_HEADER_SIZE)
|
if (ddsDataSize < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// DDS files always start with the same magic number ("DDS ")
|
// DDS files always start with the same magic number ("DDS ")
|
||||||
const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData);
|
auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData);
|
||||||
if (dwMagicNumber != DDS_MAGIC)
|
if (dwMagicNumber != DDS_MAGIC)
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
@ -203,7 +195,7 @@ namespace
|
|||||||
(MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
|
(MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
|
||||||
{
|
{
|
||||||
// Must be long enough for both headers and magic value
|
// Must be long enough for both headers and magic value
|
||||||
if (ddsDataSize < DDS_DX10_HEADER_SIZE)
|
if (ddsDataSize < (sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10)))
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
@ -213,7 +205,8 @@ namespace
|
|||||||
|
|
||||||
// setup the pointers in the process request
|
// setup the pointers in the process request
|
||||||
*header = hdr;
|
*header = hdr;
|
||||||
auto offset = DDS_MIN_HEADER_SIZE
|
auto offset = sizeof(uint32_t)
|
||||||
|
+ sizeof(DDS_HEADER)
|
||||||
+ (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0u);
|
+ (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0u);
|
||||||
*bitData = ddsData + offset;
|
*bitData = ddsData + offset;
|
||||||
*bitSize = ddsDataSize - offset;
|
*bitSize = ddsDataSize - offset;
|
||||||
@ -238,10 +231,20 @@ namespace
|
|||||||
*bitSize = 0;
|
*bitSize = 0;
|
||||||
|
|
||||||
// open the file
|
// open the file
|
||||||
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
ScopedHandle hFile(safe_handle(CreateFile2(
|
||||||
fileName,
|
fileName,
|
||||||
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
||||||
nullptr)));
|
nullptr)));
|
||||||
|
#else
|
||||||
|
ScopedHandle hFile(safe_handle(CreateFileW(
|
||||||
|
fileName,
|
||||||
|
GENERIC_READ, FILE_SHARE_READ,
|
||||||
|
nullptr,
|
||||||
|
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
|
||||||
|
nullptr)));
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!hFile)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -261,7 +264,7 @@ namespace
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Need at least enough data to fill the header and magic number to be a valid DDS
|
// Need at least enough data to fill the header and magic number to be a valid DDS
|
||||||
if (fileInfo.EndOfFile.LowPart < DDS_MIN_HEADER_SIZE)
|
if (fileInfo.EndOfFile.LowPart < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
@ -293,7 +296,7 @@ namespace
|
|||||||
}
|
}
|
||||||
|
|
||||||
// DDS files always start with the same magic number ("DDS ")
|
// DDS files always start with the same magic number ("DDS ")
|
||||||
const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
|
auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
|
||||||
if (dwMagicNumber != DDS_MAGIC)
|
if (dwMagicNumber != DDS_MAGIC)
|
||||||
{
|
{
|
||||||
ddsData.reset();
|
ddsData.reset();
|
||||||
@ -316,7 +319,7 @@ namespace
|
|||||||
(MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
|
(MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
|
||||||
{
|
{
|
||||||
// Must be long enough for both headers and magic value
|
// Must be long enough for both headers and magic value
|
||||||
if (fileInfo.EndOfFile.LowPart < DDS_DX10_HEADER_SIZE)
|
if (fileInfo.EndOfFile.LowPart < (sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10)))
|
||||||
{
|
{
|
||||||
ddsData.reset();
|
ddsData.reset();
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
@ -327,7 +330,7 @@ namespace
|
|||||||
|
|
||||||
// setup the pointers in the process request
|
// setup the pointers in the process request
|
||||||
*header = hdr;
|
*header = hdr;
|
||||||
auto offset = DDS_MIN_HEADER_SIZE
|
auto offset = sizeof(uint32_t) + sizeof(DDS_HEADER)
|
||||||
+ (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0u);
|
+ (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0u);
|
||||||
*bitData = ddsData.get() + offset;
|
*bitData = ddsData.get() + offset;
|
||||||
*bitSize = fileInfo.EndOfFile.LowPart - offset;
|
*bitSize = fileInfo.EndOfFile.LowPart - offset;
|
||||||
@ -491,7 +494,7 @@ namespace
|
|||||||
_In_ size_t width,
|
_In_ size_t width,
|
||||||
_In_ size_t height,
|
_In_ size_t height,
|
||||||
_In_ DXGI_FORMAT fmt,
|
_In_ DXGI_FORMAT fmt,
|
||||||
_Out_opt_ size_t* outNumBytes,
|
size_t* outNumBytes,
|
||||||
_Out_opt_ size_t* outRowBytes,
|
_Out_opt_ size_t* outRowBytes,
|
||||||
_Out_opt_ size_t* outNumRows) noexcept
|
_Out_opt_ size_t* outNumRows) noexcept
|
||||||
{
|
{
|
||||||
@ -505,9 +508,6 @@ namespace
|
|||||||
size_t bpe = 0;
|
size_t bpe = 0;
|
||||||
switch (fmt)
|
switch (fmt)
|
||||||
{
|
{
|
||||||
case DXGI_FORMAT_UNKNOWN:
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
case DXGI_FORMAT_BC1_TYPELESS:
|
case DXGI_FORMAT_BC1_TYPELESS:
|
||||||
case DXGI_FORMAT_BC1_UNORM:
|
case DXGI_FORMAT_BC1_UNORM:
|
||||||
case DXGI_FORMAT_BC1_UNORM_SRGB:
|
case DXGI_FORMAT_BC1_UNORM_SRGB:
|
||||||
@ -561,15 +561,6 @@ namespace
|
|||||||
bpe = 2;
|
bpe = 2;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN10)
|
|
||||||
|
|
||||||
case DXGI_FORMAT_P208:
|
|
||||||
planar = true;
|
|
||||||
bpe = 2;
|
|
||||||
break;
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
case DXGI_FORMAT_P010:
|
case DXGI_FORMAT_P010:
|
||||||
case DXGI_FORMAT_P016:
|
case DXGI_FORMAT_P016:
|
||||||
if ((height % 2) != 0)
|
if ((height % 2) != 0)
|
||||||
@ -755,9 +746,6 @@ namespace
|
|||||||
|
|
||||||
// No 3:3:2 or paletted DXGI formats aka D3DFMT_R3G3B2, D3DFMT_P8
|
// No 3:3:2 or paletted DXGI formats aka D3DFMT_R3G3B2, D3DFMT_P8
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return DXGI_FORMAT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (ddpf.flags & DDS_LUMINANCE)
|
else if (ddpf.flags & DDS_LUMINANCE)
|
||||||
@ -788,9 +776,6 @@ namespace
|
|||||||
return DXGI_FORMAT_R8G8_UNORM; // Some DDS writers assume the bitcount should be 8 instead of 16
|
return DXGI_FORMAT_R8G8_UNORM; // Some DDS writers assume the bitcount should be 8 instead of 16
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return DXGI_FORMAT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (ddpf.flags & DDS_ALPHA)
|
else if (ddpf.flags & DDS_ALPHA)
|
||||||
@ -823,9 +808,6 @@ namespace
|
|||||||
return DXGI_FORMAT_R8G8_SNORM; // D3DX10/11 writes this out as DX10 extension
|
return DXGI_FORMAT_R8G8_SNORM; // D3DX10/11 writes this out as DX10 extension
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return DXGI_FORMAT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// No DXGI format maps to DDPF_BUMPLUMINANCE aka D3DFMT_L6V5U5, D3DFMT_X8L8V8U8
|
// No DXGI format maps to DDPF_BUMPLUMINANCE aka D3DFMT_L6V5U5, D3DFMT_X8L8V8U8
|
||||||
@ -926,9 +908,6 @@ namespace
|
|||||||
return DXGI_FORMAT_R32G32B32A32_FLOAT;
|
return DXGI_FORMAT_R32G32B32A32_FLOAT;
|
||||||
|
|
||||||
// No DXGI format maps to D3DFMT_CxV8U8
|
// No DXGI format maps to D3DFMT_CxV8U8
|
||||||
|
|
||||||
default:
|
|
||||||
return DXGI_FORMAT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1333,9 +1312,6 @@ namespace
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return hr;
|
return hr;
|
||||||
@ -1750,7 +1726,7 @@ namespace
|
|||||||
if (MAKEFOURCC('D', 'X', '1', '0') == header->ddspf.fourCC)
|
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 d3d10ext = reinterpret_cast<const DDS_HEADER_DXT10*>(reinterpret_cast<const uint8_t*>(header) + sizeof(DDS_HEADER));
|
||||||
const auto mode = static_cast<DDS_ALPHA_MODE>(d3d10ext->miscFlags2 & DDS_MISC_FLAGS2_ALPHA_MODE_MASK);
|
auto const mode = static_cast<DDS_ALPHA_MODE>(d3d10ext->miscFlags2 & DDS_MISC_FLAGS2_ALPHA_MODE_MASK);
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case DDS_ALPHA_MODE_STRAIGHT:
|
case DDS_ALPHA_MODE_STRAIGHT:
|
||||||
@ -1795,19 +1771,29 @@ namespace
|
|||||||
);
|
);
|
||||||
if (result > 0)
|
if (result > 0)
|
||||||
{
|
{
|
||||||
|
const char* pstrName = strrchr(strFileA, '\\');
|
||||||
|
if (!pstrName)
|
||||||
|
{
|
||||||
|
pstrName = strFileA;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
pstrName++;
|
||||||
|
}
|
||||||
|
|
||||||
if (texture && *texture)
|
if (texture && *texture)
|
||||||
{
|
{
|
||||||
(*texture)->SetPrivateData(WKPDID_D3DDebugObjectName,
|
(*texture)->SetPrivateData(WKPDID_D3DDebugObjectName,
|
||||||
static_cast<UINT>(result),
|
static_cast<UINT>(strnlen_s(pstrName, MAX_PATH)),
|
||||||
strFileA
|
pstrName
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (textureView && *textureView)
|
if (textureView && *textureView)
|
||||||
{
|
{
|
||||||
(*textureView)->SetPrivateData(WKPDID_D3DDebugObjectName,
|
(*textureView)->SetPrivateData(WKPDID_D3DDebugObjectName,
|
||||||
static_cast<UINT>(result),
|
static_cast<UINT>(strnlen_s(pstrName, MAX_PATH)),
|
||||||
strFileA
|
pstrName
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -51,7 +51,6 @@ namespace DirectX
|
|||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
#pragma clang diagnostic push
|
#pragma clang diagnostic push
|
||||||
#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
|
#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
|
||||||
#pragma clang diagnostic ignored "-Wextra-semi-stmt"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DEFINE_ENUM_FLAG_OPERATORS(DDS_LOADER_FLAGS);
|
DEFINE_ENUM_FLAG_OPERATORS(DDS_LOADER_FLAGS);
|
||||||
|
|||||||
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cstdint>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <new>
|
#include <new>
|
||||||
|
|
||||||
@ -82,8 +81,6 @@ using namespace DirectX;
|
|||||||
//
|
//
|
||||||
// See DDS.h in the 'Texconv' sample and the 'DirectXTex' library
|
// See DDS.h in the 'Texconv' sample and the 'DirectXTex' library
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
namespace
|
|
||||||
{
|
|
||||||
#pragma pack(push,1)
|
#pragma pack(push,1)
|
||||||
|
|
||||||
constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
|
constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
|
||||||
@ -157,15 +154,9 @@ namespace
|
|||||||
|
|
||||||
#pragma pack(pop)
|
#pragma pack(pop)
|
||||||
|
|
||||||
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");
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
|
namespace
|
||||||
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
struct handle_closer { void operator()(HANDLE h) noexcept { if (h) CloseHandle(h); } };
|
struct handle_closer { void operator()(HANDLE h) noexcept { if (h) CloseHandle(h); } };
|
||||||
|
|
||||||
@ -183,7 +174,8 @@ namespace
|
|||||||
#else
|
#else
|
||||||
template<UINT TNameLength>
|
template<UINT TNameLength>
|
||||||
inline void SetDebugObjectName(_In_ ID3D12DeviceChild*, _In_z_ const wchar_t(&)[TNameLength]) noexcept
|
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
|
inline uint32_t CountMips(uint32_t width, uint32_t height) noexcept
|
||||||
@ -222,13 +214,13 @@ namespace
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ddsDataSize < DDS_MIN_HEADER_SIZE)
|
if (ddsDataSize < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// DDS files always start with the same magic number ("DDS ")
|
// DDS files always start with the same magic number ("DDS ")
|
||||||
const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData);
|
auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData);
|
||||||
if (dwMagicNumber != DDS_MAGIC)
|
if (dwMagicNumber != DDS_MAGIC)
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
@ -249,7 +241,7 @@ namespace
|
|||||||
(MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
|
(MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
|
||||||
{
|
{
|
||||||
// Must be long enough for both headers and magic value
|
// Must be long enough for both headers and magic value
|
||||||
if (ddsDataSize < DDS_DX10_HEADER_SIZE)
|
if (ddsDataSize < (sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10)))
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
@ -259,7 +251,8 @@ namespace
|
|||||||
|
|
||||||
// setup the pointers in the process request
|
// setup the pointers in the process request
|
||||||
*header = hdr;
|
*header = hdr;
|
||||||
auto offset = DDS_MIN_HEADER_SIZE
|
auto offset = sizeof(uint32_t)
|
||||||
|
+ sizeof(DDS_HEADER)
|
||||||
+ (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0u);
|
+ (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0u);
|
||||||
*bitData = ddsData + offset;
|
*bitData = ddsData + offset;
|
||||||
*bitSize = ddsDataSize - offset;
|
*bitSize = ddsDataSize - offset;
|
||||||
@ -309,7 +302,7 @@ namespace
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Need at least enough data to fill the header and magic number to be a valid DDS
|
// Need at least enough data to fill the header and magic number to be a valid DDS
|
||||||
if (fileInfo.EndOfFile.LowPart < DDS_MIN_HEADER_SIZE)
|
if (fileInfo.EndOfFile.LowPart < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
@ -352,7 +345,7 @@ namespace
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
||||||
// Need at least enough data to fill the header and magic number to be a valid DDS
|
// Need at least enough data to fill the header and magic number to be a valid DDS
|
||||||
if (fileLen < DDS_MIN_HEADER_SIZE)
|
if (fileLen < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
||||||
ddsData.reset(new (std::nothrow) uint8_t[size_t(fileLen)]);
|
ddsData.reset(new (std::nothrow) uint8_t[size_t(fileLen)]);
|
||||||
@ -379,7 +372,7 @@ namespace
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// DDS files always start with the same magic number ("DDS ")
|
// DDS files always start with the same magic number ("DDS ")
|
||||||
const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
|
auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
|
||||||
if (dwMagicNumber != DDS_MAGIC)
|
if (dwMagicNumber != DDS_MAGIC)
|
||||||
{
|
{
|
||||||
ddsData.reset();
|
ddsData.reset();
|
||||||
@ -402,7 +395,7 @@ namespace
|
|||||||
(MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
|
(MAKEFOURCC('D', 'X', '1', '0') == hdr->ddspf.fourCC))
|
||||||
{
|
{
|
||||||
// Must be long enough for both headers and magic value
|
// Must be long enough for both headers and magic value
|
||||||
if (len < DDS_DX10_HEADER_SIZE)
|
if (len < (sizeof(uint32_t) + sizeof(DDS_HEADER) + sizeof(DDS_HEADER_DXT10)))
|
||||||
{
|
{
|
||||||
ddsData.reset();
|
ddsData.reset();
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
@ -413,7 +406,7 @@ namespace
|
|||||||
|
|
||||||
// setup the pointers in the process request
|
// setup the pointers in the process request
|
||||||
*header = hdr;
|
*header = hdr;
|
||||||
auto offset = DDS_MIN_HEADER_SIZE
|
auto offset = sizeof(uint32_t) + sizeof(DDS_HEADER)
|
||||||
+ (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0u);
|
+ (bDXT10Header ? sizeof(DDS_HEADER_DXT10) : 0u);
|
||||||
*bitData = ddsData.get() + offset;
|
*bitData = ddsData.get() + offset;
|
||||||
*bitSize = len - offset;
|
*bitSize = len - offset;
|
||||||
@ -580,7 +573,7 @@ namespace
|
|||||||
_In_ size_t width,
|
_In_ size_t width,
|
||||||
_In_ size_t height,
|
_In_ size_t height,
|
||||||
_In_ DXGI_FORMAT fmt,
|
_In_ DXGI_FORMAT fmt,
|
||||||
_Out_opt_ size_t* outNumBytes,
|
size_t* outNumBytes,
|
||||||
_Out_opt_ size_t* outRowBytes,
|
_Out_opt_ size_t* outRowBytes,
|
||||||
_Out_opt_ size_t* outNumRows) noexcept
|
_Out_opt_ size_t* outNumRows) noexcept
|
||||||
{
|
{
|
||||||
@ -594,9 +587,6 @@ namespace
|
|||||||
size_t bpe = 0;
|
size_t bpe = 0;
|
||||||
switch (fmt)
|
switch (fmt)
|
||||||
{
|
{
|
||||||
case DXGI_FORMAT_UNKNOWN:
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
case DXGI_FORMAT_BC1_TYPELESS:
|
case DXGI_FORMAT_BC1_TYPELESS:
|
||||||
case DXGI_FORMAT_BC1_UNORM:
|
case DXGI_FORMAT_BC1_UNORM:
|
||||||
case DXGI_FORMAT_BC1_UNORM_SRGB:
|
case DXGI_FORMAT_BC1_UNORM_SRGB:
|
||||||
@ -840,9 +830,6 @@ namespace
|
|||||||
|
|
||||||
// No 3:3:2 or paletted DXGI formats aka D3DFMT_R3G3B2, D3DFMT_P8
|
// No 3:3:2 or paletted DXGI formats aka D3DFMT_R3G3B2, D3DFMT_P8
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return DXGI_FORMAT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (ddpf.flags & DDS_LUMINANCE)
|
else if (ddpf.flags & DDS_LUMINANCE)
|
||||||
@ -873,9 +860,6 @@ namespace
|
|||||||
return DXGI_FORMAT_R8G8_UNORM; // Some DDS writers assume the bitcount should be 8 instead of 16
|
return DXGI_FORMAT_R8G8_UNORM; // Some DDS writers assume the bitcount should be 8 instead of 16
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return DXGI_FORMAT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (ddpf.flags & DDS_ALPHA)
|
else if (ddpf.flags & DDS_ALPHA)
|
||||||
@ -908,9 +892,6 @@ namespace
|
|||||||
return DXGI_FORMAT_R8G8_SNORM; // D3DX10/11 writes this out as DX10 extension
|
return DXGI_FORMAT_R8G8_SNORM; // D3DX10/11 writes this out as DX10 extension
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return DXGI_FORMAT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// No DXGI format maps to DDPF_BUMPLUMINANCE aka D3DFMT_L6V5U5, D3DFMT_X8L8V8U8
|
// No DXGI format maps to DDPF_BUMPLUMINANCE aka D3DFMT_L6V5U5, D3DFMT_X8L8V8U8
|
||||||
@ -1011,9 +992,6 @@ namespace
|
|||||||
return DXGI_FORMAT_R32G32B32A32_FLOAT;
|
return DXGI_FORMAT_R32G32B32A32_FLOAT;
|
||||||
|
|
||||||
// No DXGI format maps to D3DFMT_CxV8U8
|
// No DXGI format maps to D3DFMT_CxV8U8
|
||||||
|
|
||||||
default:
|
|
||||||
return DXGI_FORMAT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1149,9 +1127,6 @@ namespace
|
|||||||
res.SlicePitch = res.RowPitch * static_cast<LONG>(height);
|
res.SlicePitch = res.RowPitch * static_cast<LONG>(height);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1622,7 +1597,7 @@ namespace
|
|||||||
if (MAKEFOURCC('D', 'X', '1', '0') == header->ddspf.fourCC)
|
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 d3d10ext = reinterpret_cast<const DDS_HEADER_DXT10*>(reinterpret_cast<const uint8_t*>(header) + sizeof(DDS_HEADER));
|
||||||
const auto mode = static_cast<DDS_ALPHA_MODE>(d3d10ext->miscFlags2 & DDS_MISC_FLAGS2_ALPHA_MODE_MASK);
|
auto const mode = static_cast<DDS_ALPHA_MODE>(d3d10ext->miscFlags2 & DDS_MISC_FLAGS2_ALPHA_MODE_MASK);
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case DDS_ALPHA_MODE_STRAIGHT:
|
case DDS_ALPHA_MODE_STRAIGHT:
|
||||||
|
|||||||
@ -68,7 +68,6 @@ namespace DirectX
|
|||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
#pragma clang diagnostic push
|
#pragma clang diagnostic push
|
||||||
#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
|
#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
|
||||||
#pragma clang diagnostic ignored "-Wextra-semi-stmt"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DEFINE_ENUM_FLAG_OPERATORS(DDS_LOADER_FLAGS);
|
DEFINE_ENUM_FLAG_OPERATORS(DDS_LOADER_FLAGS);
|
||||||
|
|||||||
@ -20,7 +20,6 @@
|
|||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cstdint>
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <new>
|
#include <new>
|
||||||
@ -58,8 +57,6 @@ using Microsoft::WRL::ComPtr;
|
|||||||
//
|
//
|
||||||
// See DDS.h in the 'Texconv' sample and the 'DirectXTex' library
|
// See DDS.h in the 'Texconv' sample and the 'DirectXTex' library
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
namespace
|
|
||||||
{
|
|
||||||
#pragma pack(push,1)
|
#pragma pack(push,1)
|
||||||
|
|
||||||
constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
|
constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
|
||||||
@ -118,12 +115,9 @@ namespace
|
|||||||
|
|
||||||
#pragma pack(pop)
|
#pragma pack(pop)
|
||||||
|
|
||||||
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);
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
|
namespace
|
||||||
|
{
|
||||||
struct handle_closer { void operator()(HANDLE h) noexcept { if (h) CloseHandle(h); } };
|
struct handle_closer { void operator()(HANDLE h) noexcept { if (h) CloseHandle(h); } };
|
||||||
|
|
||||||
using ScopedHandle = std::unique_ptr<void, handle_closer>;
|
using ScopedHandle = std::unique_ptr<void, handle_closer>;
|
||||||
@ -150,13 +144,13 @@ namespace
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ddsDataSize < DDS_DX9_HEADER_SIZE)
|
if (ddsDataSize < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// DDS files always start with the same magic number ("DDS ")
|
// DDS files always start with the same magic number ("DDS ")
|
||||||
const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData);
|
auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData);
|
||||||
if (dwMagicNumber != DDS_MAGIC)
|
if (dwMagicNumber != DDS_MAGIC)
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
@ -181,8 +175,9 @@ namespace
|
|||||||
|
|
||||||
// setup the pointers in the process request
|
// setup the pointers in the process request
|
||||||
*header = hdr;
|
*header = hdr;
|
||||||
*bitData = ddsData + DDS_DX9_HEADER_SIZE;
|
auto offset = sizeof(uint32_t) + sizeof(DDS_HEADER);
|
||||||
*bitSize = ddsDataSize - DDS_DX9_HEADER_SIZE;
|
*bitData = ddsData + offset;
|
||||||
|
*bitSize = ddsDataSize - offset;
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
@ -204,10 +199,22 @@ namespace
|
|||||||
*bitSize = 0;
|
*bitSize = 0;
|
||||||
|
|
||||||
// open the file
|
// open the file
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
fileName,
|
ScopedHandle hFile(safe_handle(CreateFile2(fileName,
|
||||||
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
GENERIC_READ,
|
||||||
|
FILE_SHARE_READ,
|
||||||
|
OPEN_EXISTING,
|
||||||
nullptr)));
|
nullptr)));
|
||||||
|
#else
|
||||||
|
ScopedHandle hFile(safe_handle(CreateFileW(fileName,
|
||||||
|
GENERIC_READ,
|
||||||
|
FILE_SHARE_READ,
|
||||||
|
nullptr,
|
||||||
|
OPEN_EXISTING,
|
||||||
|
FILE_ATTRIBUTE_NORMAL,
|
||||||
|
nullptr)));
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!hFile)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -227,7 +234,7 @@ namespace
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Need at least enough data to fill the header and magic number to be a valid DDS
|
// Need at least enough data to fill the header and magic number to be a valid DDS
|
||||||
if (fileInfo.EndOfFile.LowPart < DDS_DX9_HEADER_SIZE)
|
if (fileInfo.EndOfFile.LowPart < (sizeof(uint32_t) + sizeof(DDS_HEADER)))
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
@ -259,7 +266,7 @@ namespace
|
|||||||
}
|
}
|
||||||
|
|
||||||
// DDS files always start with the same magic number ("DDS ")
|
// DDS files always start with the same magic number ("DDS ")
|
||||||
const auto dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
|
auto const dwMagicNumber = *reinterpret_cast<const uint32_t*>(ddsData.get());
|
||||||
if (dwMagicNumber != DDS_MAGIC)
|
if (dwMagicNumber != DDS_MAGIC)
|
||||||
{
|
{
|
||||||
ddsData.reset();
|
ddsData.reset();
|
||||||
@ -287,8 +294,9 @@ namespace
|
|||||||
|
|
||||||
// setup the pointers in the process request
|
// setup the pointers in the process request
|
||||||
*header = hdr;
|
*header = hdr;
|
||||||
*bitData = ddsData.get() + DDS_DX9_HEADER_SIZE;
|
auto offset = sizeof(uint32_t) + sizeof(DDS_HEADER);
|
||||||
*bitSize = fileInfo.EndOfFile.LowPart - DDS_DX9_HEADER_SIZE;
|
*bitData = ddsData.get() + offset;
|
||||||
|
*bitSize = fileInfo.EndOfFile.LowPart - offset;
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
@ -404,7 +412,7 @@ namespace
|
|||||||
_In_ size_t width,
|
_In_ size_t width,
|
||||||
_In_ size_t height,
|
_In_ size_t height,
|
||||||
_In_ D3DFORMAT fmt,
|
_In_ D3DFORMAT fmt,
|
||||||
_Out_opt_ size_t* outNumBytes,
|
size_t* outNumBytes,
|
||||||
_Out_opt_ size_t* outRowBytes,
|
_Out_opt_ size_t* outRowBytes,
|
||||||
_Out_opt_ size_t* outNumRows) noexcept
|
_Out_opt_ size_t* outNumRows) noexcept
|
||||||
{
|
{
|
||||||
@ -417,9 +425,6 @@ namespace
|
|||||||
size_t bpe = 0;
|
size_t bpe = 0;
|
||||||
switch (static_cast<int>(fmt))
|
switch (static_cast<int>(fmt))
|
||||||
{
|
{
|
||||||
case D3DFMT_UNKNOWN:
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
case D3DFMT_DXT1:
|
case D3DFMT_DXT1:
|
||||||
bc = true;
|
bc = true;
|
||||||
bpe = 8;
|
bpe = 8;
|
||||||
@ -615,9 +620,6 @@ namespace
|
|||||||
|
|
||||||
// Paletted texture formats are typically not supported on modern video cards aka D3DFMT_P8, D3DFMT_A8P8
|
// Paletted texture formats are typically not supported on modern video cards aka D3DFMT_P8, D3DFMT_A8P8
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return D3DFMT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (ddpf.flags & DDS_LUMINANCE)
|
else if (ddpf.flags & DDS_LUMINANCE)
|
||||||
@ -649,9 +651,6 @@ namespace
|
|||||||
return D3DFMT_A8L8; // Some DDS writers assume the bitcount should be 8 instead of 16
|
return D3DFMT_A8L8; // Some DDS writers assume the bitcount should be 8 instead of 16
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return D3DFMT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (ddpf.flags & DDS_ALPHA)
|
else if (ddpf.flags & DDS_ALPHA)
|
||||||
@ -686,9 +685,6 @@ namespace
|
|||||||
return D3DFMT_V8U8;
|
return D3DFMT_V8U8;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return D3DFMT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (ddpf.flags & DDS_BUMPLUMINANCE)
|
else if (ddpf.flags & DDS_BUMPLUMINANCE)
|
||||||
@ -708,9 +704,6 @@ namespace
|
|||||||
return D3DFMT_L6V5U5;
|
return D3DFMT_L6V5U5;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return D3DFMT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (ddpf.flags & DDS_FOURCC)
|
else if (ddpf.flags & DDS_FOURCC)
|
||||||
@ -767,9 +760,6 @@ namespace
|
|||||||
case D3DFMT_A32B32G32R32F:
|
case D3DFMT_A32B32G32R32F:
|
||||||
case D3DFMT_CxV8U8:
|
case D3DFMT_CxV8U8:
|
||||||
return static_cast<D3DFORMAT>(ddpf.fourCC);
|
return static_cast<D3DFORMAT>(ddpf.fourCC);
|
||||||
|
|
||||||
default:
|
|
||||||
return D3DFMT_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
|||||||
|
|
||||||
// Icon with lowest ID value placed first to ensure application icon
|
// Icon with lowest ID value placed first to ensure application icon
|
||||||
// remains consistent on all systems.
|
// remains consistent on all systems.
|
||||||
IDI_MAIN_ICON ICON "..\\Common\\directx.ico"
|
IDI_MAIN_ICON ICON "directx.ico"
|
||||||
|
|
||||||
#ifdef APSTUDIO_INVOKED
|
#ifdef APSTUDIO_INVOKED
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|||||||
@ -135,7 +135,7 @@
|
|||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<AdditionalOptions>/Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
<AdditionalOptions>/Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
||||||
@ -146,7 +146,6 @@
|
|||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
<LargeAddressAware>true</LargeAddressAware>
|
||||||
<AdditionalOptions>/CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
</Link>
|
</Link>
|
||||||
<Manifest>
|
<Manifest>
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
<EnableDPIAwareness>false</EnableDPIAwareness>
|
||||||
@ -159,7 +158,7 @@
|
|||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<AdditionalOptions>/Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
<AdditionalOptions>/Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
||||||
@ -169,7 +168,6 @@
|
|||||||
<AdditionalDependencies>d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalOptions>/CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
</Link>
|
</Link>
|
||||||
<Manifest>
|
<Manifest>
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
<EnableDPIAwareness>false</EnableDPIAwareness>
|
||||||
@ -182,7 +180,7 @@
|
|||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ControlFlowGuard>Guard</ControlFlowGuard>
|
<ControlFlowGuard>Guard</ControlFlowGuard>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
@ -196,7 +194,6 @@
|
|||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
<LargeAddressAware>true</LargeAddressAware>
|
||||||
<AdditionalOptions>/CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
</Link>
|
</Link>
|
||||||
<Manifest>
|
<Manifest>
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
<EnableDPIAwareness>false</EnableDPIAwareness>
|
||||||
@ -208,7 +205,7 @@
|
|||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ControlFlowGuard>Guard</ControlFlowGuard>
|
<ControlFlowGuard>Guard</ControlFlowGuard>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
@ -221,7 +218,6 @@
|
|||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<AdditionalOptions>/CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
</Link>
|
</Link>
|
||||||
<Manifest>
|
<Manifest>
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
<EnableDPIAwareness>false</EnableDPIAwareness>
|
||||||
@ -234,7 +230,7 @@
|
|||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ControlFlowGuard>Guard</ControlFlowGuard>
|
<ControlFlowGuard>Guard</ControlFlowGuard>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
@ -248,7 +244,6 @@
|
|||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
<LargeAddressAware>true</LargeAddressAware>
|
||||||
<AdditionalOptions>/CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
</Link>
|
</Link>
|
||||||
<Manifest>
|
<Manifest>
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
<EnableDPIAwareness>false</EnableDPIAwareness>
|
||||||
@ -260,7 +255,7 @@
|
|||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ControlFlowGuard>Guard</ControlFlowGuard>
|
<ControlFlowGuard>Guard</ControlFlowGuard>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
@ -273,7 +268,6 @@
|
|||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<AdditionalOptions>/CETCOMPAT %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
</Link>
|
</Link>
|
||||||
<Manifest>
|
<Manifest>
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
<EnableDPIAwareness>false</EnableDPIAwareness>
|
||||||
@ -291,7 +285,7 @@
|
|||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="ddsview.hlsl" />
|
<None Include="ddsview.fx" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets" />
|
<ImportGroup Label="ExtensionTargets" />
|
||||||
@ -300,13 +294,10 @@
|
|||||||
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
|
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
|
||||||
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
|
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
|
||||||
<_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\</_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>
|
</PropertyGroup>
|
||||||
<Exec Condition="!Exists('Shaders/ddsview_vs.inc')" WorkingDirectory="$(ProjectDir)" Command="hlsl" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath);WindowsSDKVersion=$(_ATGFXCVer);CompileShadersOutput=$(ProjectDir)\Shaders" LogStandardErrorAsError="true" />
|
<Exec Condition="!Exists('Shaders/ddsview_vs.inc')" WorkingDirectory="$(ProjectDir)" Command="hlsl" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath)" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_ATGFXCPath />
|
<_ATGFXCPath />
|
||||||
<_ATGFXCVer />
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Target>
|
</Target>
|
||||||
<Target Name="ATGDeleteShaders" AfterTargets="Clean">
|
<Target Name="ATGDeleteShaders" AfterTargets="Clean">
|
||||||
|
|||||||
@ -15,6 +15,6 @@
|
|||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="ddsview.hlsl" />
|
<None Include="ddsview.fx" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@ -135,7 +135,7 @@
|
|||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
|
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
|
||||||
@ -159,7 +159,7 @@
|
|||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
|
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
|
||||||
@ -182,7 +182,7 @@
|
|||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ControlFlowGuard>Guard</ControlFlowGuard>
|
<ControlFlowGuard>Guard</ControlFlowGuard>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
@ -208,7 +208,7 @@
|
|||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ControlFlowGuard>Guard</ControlFlowGuard>
|
<ControlFlowGuard>Guard</ControlFlowGuard>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
@ -234,7 +234,7 @@
|
|||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ControlFlowGuard>Guard</ControlFlowGuard>
|
<ControlFlowGuard>Guard</ControlFlowGuard>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
@ -260,7 +260,7 @@
|
|||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\DirectXTex;$(ProjectDir)Shaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ControlFlowGuard>Guard</ControlFlowGuard>
|
<ControlFlowGuard>Guard</ControlFlowGuard>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
@ -291,7 +291,7 @@
|
|||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="ddsview.hlsl" />
|
<None Include="ddsview.fx" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets" />
|
<ImportGroup Label="ExtensionTargets" />
|
||||||
@ -300,13 +300,10 @@
|
|||||||
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
|
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
|
||||||
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
|
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
|
||||||
<_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\</_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>
|
</PropertyGroup>
|
||||||
<Exec Condition="!Exists('Shaders/ddsview_vs.inc')" WorkingDirectory="$(ProjectDir)" Command="hlsl" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath);WindowsSDKVersion=$(_ATGFXCVer);CompileShadersOutput=$(ProjectDir)\Shaders" LogStandardErrorAsError="true" />
|
<Exec Condition="!Exists('Shaders/ddsview_vs.inc')" WorkingDirectory="$(ProjectDir)" Command="hlsl" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath)" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_ATGFXCPath />
|
<_ATGFXCPath />
|
||||||
<_ATGFXCVer />
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Target>
|
</Target>
|
||||||
<Target Name="ATGDeleteShaders" AfterTargets="Clean">
|
<Target Name="ATGDeleteShaders" AfterTargets="Clean">
|
||||||
|
|||||||
@ -15,6 +15,6 @@
|
|||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="ddsview.hlsl" />
|
<None Include="ddsview.fx" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@ -25,9 +25,7 @@
|
|||||||
|
|
||||||
#include <DirectXMath.h>
|
#include <DirectXMath.h>
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning(disable : 4619 4616 26812)
|
#pragma warning(disable : 4619 4616 26812)
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "DirectXTex.h"
|
#include "DirectXTex.h"
|
||||||
|
|
||||||
@ -105,9 +103,7 @@ LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
|
|||||||
void Render();
|
void Render();
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning( suppress : 6262 )
|
#pragma warning( suppress : 6262 )
|
||||||
#endif
|
|
||||||
int WINAPI wWinMain(
|
int WINAPI wWinMain(
|
||||||
_In_ HINSTANCE hInstance,
|
_In_ HINSTANCE hInstance,
|
||||||
_In_opt_ HINSTANCE /*hPrevInstance*/,
|
_In_opt_ HINSTANCE /*hPrevInstance*/,
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
@ -5,25 +5,16 @@ rem Licensed under the MIT License.
|
|||||||
setlocal
|
setlocal
|
||||||
set error=0
|
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 FXCOPTS=/nologo /WX /Ges /Qstrip_reflect /Qstrip_debug
|
||||||
|
|
||||||
if defined LegacyShaderCompiler goto fxcviaenv
|
set PCFXC="%WindowsSdkVerBinPath%x86\fxc.exe"
|
||||||
set PCFXC="%WindowsSdkVerBinPath%%FXCARCH%\fxc.exe"
|
|
||||||
if exist %PCFXC% goto continue
|
if exist %PCFXC% goto continue
|
||||||
set PCFXC="%WindowsSdkBinPath%%WindowsSDKVersion%\%FXCARCH%\fxc.exe"
|
set PCFXC="%WindowsSdkBinPath%%WindowsSDKVersion%\x86\fxc.exe"
|
||||||
if exist %PCFXC% goto continue
|
if exist %PCFXC% goto continue
|
||||||
set PCFXC="%WindowsSdkDir%bin\%WindowsSDKVersion%\%FXCARCH%\fxc.exe"
|
set PCFXC="%WindowsSdkDir%bin\%WindowsSDKVersion%\x86\fxc.exe"
|
||||||
if exist %PCFXC% goto continue
|
if exist %PCFXC% goto continue
|
||||||
|
|
||||||
set PCFXC=fxc.exe
|
set PCFXC=fxc.exe
|
||||||
goto continue
|
|
||||||
|
|
||||||
:fxcviaenv
|
|
||||||
set PCFXC="%LegacyShaderCompiler%"
|
|
||||||
if not exist %PCFXC% goto needfxc
|
|
||||||
goto continue
|
|
||||||
|
|
||||||
:continue
|
:continue
|
||||||
if not defined CompileShadersOutput set CompileShadersOutput=Shaders
|
if not defined CompileShadersOutput set CompileShadersOutput=Shaders
|
||||||
@ -32,50 +23,45 @@ set StrTrim=%StrTrim: ##=%
|
|||||||
set CompileShadersOutput=%StrTrim:##=%
|
set CompileShadersOutput=%StrTrim:##=%
|
||||||
@if not exist "%CompileShadersOutput%" mkdir "%CompileShadersOutput%"
|
@if not exist "%CompileShadersOutput%" mkdir "%CompileShadersOutput%"
|
||||||
|
|
||||||
set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EVS /Tvs_4_1 /Fh%CompileShadersOutput%\ddsview_vs.inc
|
|
||||||
|
set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EVS /Tvs_4_1 /Fh%CompileShadersOutput%\ddsview_vs.inc
|
||||||
echo %FXC%
|
echo %FXC%
|
||||||
%FXC%
|
%FXC%
|
||||||
@if ERRORLEVEL 1 goto error
|
@if ERRORLEVEL 1 goto error
|
||||||
|
|
||||||
set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EPS_1D /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps1D.inc
|
set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EPS_1D /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps1D.inc
|
||||||
echo %FXC%
|
echo %FXC%
|
||||||
%FXC%
|
%FXC%
|
||||||
@if ERRORLEVEL 1 goto error
|
@if ERRORLEVEL 1 goto error
|
||||||
|
|
||||||
set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EPS_1DArray /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps1Darray.inc
|
set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EPS_1DArray /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps1Darray.inc
|
||||||
echo %FXC%
|
echo %FXC%
|
||||||
%FXC%
|
%FXC%
|
||||||
@if ERRORLEVEL 1 goto error
|
@if ERRORLEVEL 1 goto error
|
||||||
|
|
||||||
set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EPS_2D /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps2D.inc
|
set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EPS_2D /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps2D.inc
|
||||||
echo %FXC%
|
echo %FXC%
|
||||||
%FXC%
|
%FXC%
|
||||||
@if ERRORLEVEL 1 goto error
|
@if ERRORLEVEL 1 goto error
|
||||||
|
|
||||||
set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EPS_2DArray /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps2Darray.inc
|
set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EPS_2DArray /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps2Darray.inc
|
||||||
echo %FXC%
|
echo %FXC%
|
||||||
%FXC%
|
%FXC%
|
||||||
@if ERRORLEVEL 1 goto error
|
@if ERRORLEVEL 1 goto error
|
||||||
|
|
||||||
set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EPS_3D /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps3D.inc
|
set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EPS_3D /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_ps3D.inc
|
||||||
echo %FXC%
|
echo %FXC%
|
||||||
%FXC%
|
%FXC%
|
||||||
@if ERRORLEVEL 1 goto error
|
@if ERRORLEVEL 1 goto error
|
||||||
|
|
||||||
set FXC=%PCFXC% ddsview.hlsl %FXCOPTS% /EPS_Cube /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_psCube.inc
|
set FXC=%PCFXC% ddsview.fx %FXCOPTS% /EPS_Cube /Tps_4_1 /Fh%CompileShadersOutput%\ddsview_psCube.inc
|
||||||
echo %FXC%
|
echo %FXC%
|
||||||
%FXC%
|
%FXC%
|
||||||
@if ERRORLEVEL 1 goto error
|
@if ERRORLEVEL 1 goto error
|
||||||
|
|
||||||
@echo --- Shaders built ok ---
|
@echo --- Shaders built ok ---
|
||||||
endlocal
|
@goto end
|
||||||
exit /b 0
|
|
||||||
|
|
||||||
:error
|
:error
|
||||||
@echo --- ERROR: Shader build failed ---
|
@echo --- ERROR: Shader build failed ---
|
||||||
exit /b 1
|
exit /b 1
|
||||||
|
|
||||||
:needfxc
|
|
||||||
echo ERROR: CompileShaders requires FXC.EXE
|
|
||||||
exit /b 1
|
|
||||||
:end
|
:end
|
||||||
@ -203,7 +203,7 @@ namespace
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Use Newton's Method to find local minima of sum-of-squares error.
|
// Use Newton's Method to find local minima of sum-of-squares error.
|
||||||
const auto fSteps = static_cast<float>(cSteps - 1);
|
auto const fSteps = static_cast<float>(cSteps - 1);
|
||||||
|
|
||||||
for (size_t iIteration = 0; iIteration < 8; iIteration++)
|
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;
|
float fAlphaA, fAlphaB;
|
||||||
OptimizeAlpha<false>(&fAlphaA, &fAlphaB, fAlpha, uSteps);
|
OptimizeAlpha<false>(&fAlphaA, &fAlphaB, fAlpha, uSteps);
|
||||||
|
|
||||||
const auto bAlphaA = static_cast<uint8_t>(static_cast<int32_t>(fAlphaA * 255.0f + 0.5f));
|
auto const 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));
|
auto const bAlphaB = static_cast<uint8_t>(static_cast<int32_t>(fAlphaB * 255.0f + 0.5f));
|
||||||
|
|
||||||
fAlphaA = static_cast<float>(bAlphaA) * (1.0f / 255.0f);
|
fAlphaA = static_cast<float>(bAlphaA) * (1.0f / 255.0f);
|
||||||
fAlphaB = static_cast<float>(bAlphaB) * (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
|
// Encode alpha bitmap
|
||||||
const auto fSteps = static_cast<float>(uSteps - 1);
|
auto const fSteps = static_cast<float>(uSteps - 1);
|
||||||
const float fScale = (fStep[0] != fStep[1]) ? (fSteps / (fStep[1] - fStep[0])) : 0.0f;
|
const float fScale = (fStep[0] != fStep[1]) ? (fSteps / (fStep[1] - fStep[0])) : 0.0f;
|
||||||
|
|
||||||
if (flags & BC_FLAGS_DITHER_A)
|
if (flags & BC_FLAGS_DITHER_A)
|
||||||
|
|||||||
@ -61,12 +61,6 @@ namespace DirectX
|
|||||||
HDRColorA() = default;
|
HDRColorA() = default;
|
||||||
HDRColorA(float _r, float _g, float _b, float _a) noexcept : r(_r), g(_g), b(_b), a(_a) {}
|
HDRColorA(float _r, float _g, float _b, float _a) noexcept : r(_r), g(_g), b(_b), a(_a) {}
|
||||||
|
|
||||||
HDRColorA(HDRColorA const&) = default;
|
|
||||||
HDRColorA& operator= (const HDRColorA&) = default;
|
|
||||||
|
|
||||||
HDRColorA(HDRColorA&&) = default;
|
|
||||||
HDRColorA& operator= (HDRColorA&&) = default;
|
|
||||||
|
|
||||||
// binary operators
|
// binary operators
|
||||||
HDRColorA operator + (const HDRColorA& c) const noexcept
|
HDRColorA operator + (const HDRColorA& c) const noexcept
|
||||||
{
|
{
|
||||||
@ -230,7 +224,7 @@ namespace DirectX
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Use Newton's Method to find local minima of sum-of-squares error.
|
// Use Newton's Method to find local minima of sum-of-squares error.
|
||||||
const auto fSteps = static_cast<float>(cSteps - 1);
|
auto const fSteps = static_cast<float>(cSteps - 1);
|
||||||
|
|
||||||
for (size_t iIteration = 0; iIteration < 8; iIteration++)
|
for (size_t iIteration = 0; iIteration < 8; iIteration++)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -339,12 +339,6 @@ namespace DirectX
|
|||||||
LDRColorA() = default;
|
LDRColorA() = default;
|
||||||
LDRColorA(uint8_t _r, uint8_t _g, uint8_t _b, uint8_t _a) noexcept : r(_r), g(_g), b(_b), a(_a) {}
|
LDRColorA(uint8_t _r, uint8_t _g, uint8_t _b, uint8_t _a) noexcept : r(_r), g(_g), b(_b), a(_a) {}
|
||||||
|
|
||||||
LDRColorA(LDRColorA const&) = default;
|
|
||||||
LDRColorA& operator= (const LDRColorA&) = default;
|
|
||||||
|
|
||||||
LDRColorA(LDRColorA&&) = default;
|
|
||||||
LDRColorA& operator= (LDRColorA&&) = default;
|
|
||||||
|
|
||||||
const uint8_t& operator [] (_In_range_(0, 3) size_t uElement) const noexcept
|
const uint8_t& operator [] (_In_range_(0, 3) size_t uElement) const noexcept
|
||||||
{
|
{
|
||||||
switch (uElement)
|
switch (uElement)
|
||||||
@ -455,15 +449,10 @@ namespace
|
|||||||
int r, g, b;
|
int r, g, b;
|
||||||
int pad;
|
int pad;
|
||||||
|
|
||||||
|
public:
|
||||||
INTColor() = default;
|
INTColor() = default;
|
||||||
INTColor(int nr, int ng, int nb) noexcept : r(nr), g(ng), b(nb), pad(0) {}
|
INTColor(int nr, int ng, int nb) noexcept : r(nr), g(ng), b(nb), pad(0) {}
|
||||||
|
|
||||||
INTColor(INTColor const&) = default;
|
|
||||||
INTColor& operator= (const INTColor&) = default;
|
|
||||||
|
|
||||||
INTColor(INTColor&&) = default;
|
|
||||||
INTColor& operator= (INTColor&&) = default;
|
|
||||||
|
|
||||||
INTColor& operator += (_In_ const INTColor& c) noexcept
|
INTColor& operator += (_In_ const INTColor& c) noexcept
|
||||||
{
|
{
|
||||||
r += c.r;
|
r += c.r;
|
||||||
@ -593,7 +582,7 @@ namespace
|
|||||||
assert(uStartBit < 128);
|
assert(uStartBit < 128);
|
||||||
_Analysis_assume_(uStartBit < 128);
|
_Analysis_assume_(uStartBit < 128);
|
||||||
const size_t uIndex = uStartBit >> 3;
|
const size_t uIndex = uStartBit >> 3;
|
||||||
const auto ret = static_cast<uint8_t>((m_uBits[uIndex] >> (uStartBit - (uIndex << 3))) & 0x01);
|
auto const ret = static_cast<uint8_t>((m_uBits[uIndex] >> (uStartBit - (uIndex << 3))) & 0x01);
|
||||||
uStartBit++;
|
uStartBit++;
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -1290,7 +1279,7 @@ namespace
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Use Newton's Method to find local minima of sum-of-squares error.
|
// Use Newton's Method to find local minima of sum-of-squares error.
|
||||||
const auto fSteps = static_cast<float>(cSteps - 1);
|
auto const fSteps = static_cast<float>(cSteps - 1);
|
||||||
|
|
||||||
for (size_t iIteration = 0; iIteration < 8; iIteration++)
|
for (size_t iIteration = 0; iIteration < 8; iIteration++)
|
||||||
{
|
{
|
||||||
@ -1800,7 +1789,6 @@ void D3DX_BC6H::Decode(bool bSigned, HDRColorA* pOut) const noexcept
|
|||||||
case 0x17: warnstr = "BC6H: Reserved mode 10111 encountered during decoding\n"; break;
|
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 0x1B: warnstr = "BC6H: Reserved mode 11011 encountered during decoding\n"; break;
|
||||||
case 0x1F: warnstr = "BC6H: Reserved mode 11111 encountered during decoding\n"; break;
|
case 0x1F: warnstr = "BC6H: Reserved mode 11111 encountered during decoding\n"; break;
|
||||||
default: break;
|
|
||||||
}
|
}
|
||||||
OutputDebugStringA(warnstr);
|
OutputDebugStringA(warnstr);
|
||||||
#endif
|
#endif
|
||||||
@ -2048,7 +2036,7 @@ float D3DX_BC6H::MapColorsQuantized(const EncodeParams* pEP, const INTColor aCol
|
|||||||
_Analysis_assume_(pEP->uMode < c_NumModes);
|
_Analysis_assume_(pEP->uMode < c_NumModes);
|
||||||
|
|
||||||
const uint8_t uIndexPrec = ms_aInfo[pEP->uMode].uIndexPrec;
|
const uint8_t uIndexPrec = ms_aInfo[pEP->uMode].uIndexPrec;
|
||||||
const auto uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
|
auto const uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
|
||||||
INTColor aPalette[BC6H_MAX_INDICES];
|
INTColor aPalette[BC6H_MAX_INDICES];
|
||||||
GeneratePaletteQuantized(pEP, endPts, aPalette);
|
GeneratePaletteQuantized(pEP, endPts, aPalette);
|
||||||
|
|
||||||
@ -2264,7 +2252,7 @@ void D3DX_BC6H::AssignIndices(const EncodeParams* pEP, const INTEndPntPair aEndP
|
|||||||
_Analysis_assume_(pEP->uMode < c_NumModes);
|
_Analysis_assume_(pEP->uMode < c_NumModes);
|
||||||
|
|
||||||
const uint8_t uPartitions = ms_aInfo[pEP->uMode].uPartitions;
|
const uint8_t uPartitions = ms_aInfo[pEP->uMode].uPartitions;
|
||||||
const auto uNumIndices = static_cast<const uint8_t>(1u << ms_aInfo[pEP->uMode].uIndexPrec);
|
auto const uNumIndices = static_cast<const uint8_t>(1u << ms_aInfo[pEP->uMode].uIndexPrec);
|
||||||
|
|
||||||
assert(uPartitions < BC6H_MAX_REGIONS && pEP->uShape < BC6H_MAX_SHAPES);
|
assert(uPartitions < BC6H_MAX_REGIONS && pEP->uShape < BC6H_MAX_SHAPES);
|
||||||
_Analysis_assume_(uPartitions < BC6H_MAX_REGIONS && pEP->uShape < BC6H_MAX_SHAPES);
|
_Analysis_assume_(uPartitions < BC6H_MAX_REGIONS && pEP->uShape < BC6H_MAX_SHAPES);
|
||||||
@ -2437,7 +2425,7 @@ void D3DX_BC6H::GeneratePaletteUnquantized(const EncodeParams* pEP, size_t uRegi
|
|||||||
|
|
||||||
const INTEndPntPair& endPts = pEP->aUnqEndPts[pEP->uShape][uRegion];
|
const INTEndPntPair& endPts = pEP->aUnqEndPts[pEP->uShape][uRegion];
|
||||||
const uint8_t uIndexPrec = ms_aInfo[pEP->uMode].uIndexPrec;
|
const uint8_t uIndexPrec = ms_aInfo[pEP->uMode].uIndexPrec;
|
||||||
const auto uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
|
auto const uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
|
||||||
assert(uNumIndices > 0);
|
assert(uNumIndices > 0);
|
||||||
_Analysis_assume_(uNumIndices > 0);
|
_Analysis_assume_(uNumIndices > 0);
|
||||||
|
|
||||||
@ -2473,7 +2461,7 @@ float D3DX_BC6H::MapColors(const EncodeParams* pEP, size_t uRegion, size_t np, c
|
|||||||
_Analysis_assume_(pEP->uMode < c_NumModes);
|
_Analysis_assume_(pEP->uMode < c_NumModes);
|
||||||
|
|
||||||
const uint8_t uIndexPrec = ms_aInfo[pEP->uMode].uIndexPrec;
|
const uint8_t uIndexPrec = ms_aInfo[pEP->uMode].uIndexPrec;
|
||||||
const auto uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
|
auto const uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
|
||||||
INTColor aPalette[BC6H_MAX_INDICES];
|
INTColor aPalette[BC6H_MAX_INDICES];
|
||||||
GeneratePaletteUnquantized(pEP, uRegion, aPalette);
|
GeneratePaletteUnquantized(pEP, uRegion, aPalette);
|
||||||
|
|
||||||
@ -2577,7 +2565,7 @@ void D3DX_BC7::Decode(HDRColorA* pOut) const noexcept
|
|||||||
assert(uPartitions < BC7_MAX_REGIONS);
|
assert(uPartitions < BC7_MAX_REGIONS);
|
||||||
_Analysis_assume_(uPartitions < BC7_MAX_REGIONS);
|
_Analysis_assume_(uPartitions < BC7_MAX_REGIONS);
|
||||||
|
|
||||||
const auto uNumEndPts = static_cast<const uint8_t>((unsigned(uPartitions) + 1u) << 1);
|
auto const uNumEndPts = static_cast<const uint8_t>((unsigned(uPartitions) + 1u) << 1);
|
||||||
const uint8_t uIndexPrec = ms_aInfo[uMode].uIndexPrec;
|
const uint8_t uIndexPrec = ms_aInfo[uMode].uIndexPrec;
|
||||||
const uint8_t uIndexPrec2 = ms_aInfo[uMode].uIndexPrec2;
|
const uint8_t uIndexPrec2 = ms_aInfo[uMode].uIndexPrec2;
|
||||||
size_t i;
|
size_t i;
|
||||||
@ -2693,14 +2681,7 @@ void D3DX_BC7::Decode(HDRColorA* pOut) const noexcept
|
|||||||
|
|
||||||
for (i = 0; i < uNumEndPts; i++)
|
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);
|
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];
|
uint8_t w1[NUM_PIXELS_PER_BLOCK], w2[NUM_PIXELS_PER_BLOCK];
|
||||||
@ -2763,7 +2744,6 @@ void D3DX_BC7::Decode(HDRColorA* pOut) const noexcept
|
|||||||
case 1: std::swap(outPixel.r, outPixel.a); break;
|
case 1: std::swap(outPixel.r, outPixel.a); break;
|
||||||
case 2: std::swap(outPixel.g, outPixel.a); break;
|
case 2: std::swap(outPixel.g, outPixel.a); break;
|
||||||
case 3: std::swap(outPixel.b, outPixel.a); break;
|
case 3: std::swap(outPixel.b, outPixel.a); break;
|
||||||
default: break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pOut[i] = HDRColorA(outPixel);
|
pOut[i] = HDRColorA(outPixel);
|
||||||
@ -2839,7 +2819,6 @@ 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 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 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;
|
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)
|
for (size_t im = 0; im < uNumIdxMode && fMSEBest > 0; ++im)
|
||||||
@ -2880,7 +2859,6 @@ 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 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 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;
|
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;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3151,8 +3129,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 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;
|
const uint8_t uIndexPrec2 = uIndexMode ? ms_aInfo[pEP->uMode].uIndexPrec : ms_aInfo[pEP->uMode].uIndexPrec2;
|
||||||
const auto uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
|
auto const uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
|
||||||
const auto uNumIndices2 = static_cast<const uint8_t>(1u << uIndexPrec2);
|
auto const uNumIndices2 = static_cast<const uint8_t>(1u << uIndexPrec2);
|
||||||
|
|
||||||
assert((uNumIndices <= BC7_MAX_INDICES) && (uNumIndices2 <= BC7_MAX_INDICES));
|
assert((uNumIndices <= BC7_MAX_INDICES) && (uNumIndices2 <= BC7_MAX_INDICES));
|
||||||
_Analysis_assume_((uNumIndices <= BC7_MAX_INDICES) && (uNumIndices2 <= BC7_MAX_INDICES));
|
_Analysis_assume_((uNumIndices <= BC7_MAX_INDICES) && (uNumIndices2 <= BC7_MAX_INDICES));
|
||||||
@ -3421,15 +3399,8 @@ float D3DX_BC7::Refine(const EncodeParams* pEP, size_t uShape, size_t uRotation,
|
|||||||
|
|
||||||
for (size_t p = 0; p <= uPartitions; p++)
|
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].A = Quantize(aEndPts[p].A, ms_aInfo[pEP->uMode].RGBAPrecWithP);
|
||||||
aOrgEndPts[p].B = Quantize(aEndPts[p].B, 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];
|
LDREndPntPair newEndPts1[BC7_MAX_REGIONS];
|
||||||
@ -3505,8 +3476,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 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;
|
const uint8_t uIndexPrec2 = uIndexMode ? ms_aInfo[pEP->uMode].uIndexPrec : ms_aInfo[pEP->uMode].uIndexPrec2;
|
||||||
const auto uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
|
auto const uNumIndices = static_cast<const uint8_t>(1u << uIndexPrec);
|
||||||
const auto uNumIndices2 = static_cast<const uint8_t>(1u << uIndexPrec2);
|
auto const uNumIndices2 = static_cast<const uint8_t>(1u << uIndexPrec2);
|
||||||
size_t auPixIdx[NUM_PIXELS_PER_BLOCK];
|
size_t auPixIdx[NUM_PIXELS_PER_BLOCK];
|
||||||
LDRColorA aPalette[BC7_MAX_REGIONS][BC7_MAX_INDICES];
|
LDRColorA aPalette[BC7_MAX_REGIONS][BC7_MAX_INDICES];
|
||||||
|
|
||||||
|
|||||||
@ -101,7 +101,8 @@ GPUCompressBC::GPUCompressBC() noexcept :
|
|||||||
m_bc7_mode137(false),
|
m_bc7_mode137(false),
|
||||||
m_width(0),
|
m_width(0),
|
||||||
m_height(0)
|
m_height(0)
|
||||||
{}
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
@ -263,7 +264,7 @@ HRESULT GPUCompressBC::Prepare(size_t width, size_t height, uint32_t flags, DXGI
|
|||||||
if (sizeInBytes >= UINT32_MAX)
|
if (sizeInBytes >= UINT32_MAX)
|
||||||
return HRESULT_E_ARITHMETIC_OVERFLOW;
|
return HRESULT_E_ARITHMETIC_OVERFLOW;
|
||||||
|
|
||||||
const auto bufferSize = static_cast<size_t>(sizeInBytes);
|
auto const bufferSize = static_cast<size_t>(sizeInBytes);
|
||||||
|
|
||||||
{
|
{
|
||||||
D3D11_BUFFER_DESC desc = {};
|
D3D11_BUFFER_DESC desc = {};
|
||||||
@ -379,6 +380,7 @@ HRESULT GPUCompressBC::Compress(const Image& srcImage, const Image& destImage)
|
|||||||
|| srcImage.height != destImage.height
|
|| srcImage.height != destImage.height
|
||||||
|| srcImage.width != m_width
|
|| srcImage.width != m_width
|
||||||
|| srcImage.height != m_height
|
|| srcImage.height != m_height
|
||||||
|
|| srcImage.format != m_srcformat
|
||||||
|| destImage.format != m_bcformat)
|
|| destImage.format != m_bcformat)
|
||||||
{
|
{
|
||||||
return E_UNEXPECTED;
|
return E_UNEXPECTED;
|
||||||
@ -458,7 +460,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 xblocks = std::max<size_t>(1, (m_width + 3) >> 2);
|
||||||
const size_t yblocks = std::max<size_t>(1, (m_height + 3) >> 2);
|
const size_t yblocks = std::max<size_t>(1, (m_height + 3) >> 2);
|
||||||
|
|
||||||
const auto num_total_blocks = static_cast<UINT>(xblocks * yblocks);
|
auto const num_total_blocks = static_cast<UINT>(xblocks * yblocks);
|
||||||
UINT num_blocks = num_total_blocks;
|
UINT num_blocks = num_total_blocks;
|
||||||
UINT start_block_id = 0;
|
UINT start_block_id = 0;
|
||||||
while (num_blocks > 0)
|
while (num_blocks > 0)
|
||||||
|
|||||||
@ -17,12 +17,6 @@ namespace DirectX
|
|||||||
public:
|
public:
|
||||||
GPUCompressBC() noexcept;
|
GPUCompressBC() noexcept;
|
||||||
|
|
||||||
GPUCompressBC(GPUCompressBC&&) = default;
|
|
||||||
GPUCompressBC& operator= (GPUCompressBC&&) = default;
|
|
||||||
|
|
||||||
GPUCompressBC(GPUCompressBC const&) = delete;
|
|
||||||
GPUCompressBC& operator= (GPUCompressBC const&) = delete;
|
|
||||||
|
|
||||||
HRESULT Initialize(_In_ ID3D11Device* pDevice);
|
HRESULT Initialize(_In_ ID3D11Device* pDevice);
|
||||||
|
|
||||||
HRESULT Prepare(size_t width, size_t height, uint32_t flags, DXGI_FORMAT format, float alphaWeight);
|
HRESULT Prepare(size_t width, size_t height, uint32_t flags, DXGI_FORMAT format, float alphaWeight);
|
||||||
|
|||||||
@ -48,9 +48,8 @@ namespace DirectX
|
|||||||
#define DDS_ALPHA 0x00000002 // DDPF_ALPHA
|
#define DDS_ALPHA 0x00000002 // DDPF_ALPHA
|
||||||
#define DDS_PAL8 0x00000020 // DDPF_PALETTEINDEXED8
|
#define DDS_PAL8 0x00000020 // DDPF_PALETTEINDEXED8
|
||||||
#define DDS_PAL8A 0x00000021 // DDPF_PALETTEINDEXED8 | DDPF_ALPHAPIXELS
|
#define DDS_PAL8A 0x00000021 // DDPF_PALETTEINDEXED8 | DDPF_ALPHAPIXELS
|
||||||
#define DDS_BUMPLUMINANCE 0x00040000 // DDPF_BUMPLUMINANCE
|
|
||||||
#define DDS_BUMPDUDV 0x00080000 // DDPF_BUMPDUDV
|
#define DDS_BUMPDUDV 0x00080000 // DDPF_BUMPDUDV
|
||||||
#define DDS_BUMPDUDVA 0x00080001 // DDPF_BUMPDUDV | DDPF_ALPHAPIXELS
|
// DDS_BUMPLUMINANCE 0x00040000
|
||||||
|
|
||||||
#ifndef MAKEFOURCC
|
#ifndef MAKEFOURCC
|
||||||
#define MAKEFOURCC(ch0, ch1, ch2, ch3) \
|
#define MAKEFOURCC(ch0, ch1, ch2, ch3) \
|
||||||
@ -188,13 +187,10 @@ namespace DirectX
|
|||||||
DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_A2B10G10R10 =
|
DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_A2B10G10R10 =
|
||||||
{ sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000 };
|
{ sizeof(DDS_PIXELFORMAT), DDS_RGBA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000 };
|
||||||
|
|
||||||
// The following legacy Direct3D 9 formats use 'mixed' signed & unsigned channels so requires special handling
|
// We do not support the following legacy Direct3D 9 formats:
|
||||||
DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_A2W10V10U10 =
|
// DDSPF_A2W10V10U10 = { sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDV, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000 };
|
||||||
{ sizeof(DDS_PIXELFORMAT), DDS_BUMPDUDVA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000 };
|
// DDSPF_L6V5U5 = { sizeof(DDS_PIXELFORMAT), DDS_BUMPLUMINANCE, 0, 16, 0x001f, 0x03e0, 0xfc00, 0 };
|
||||||
DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_L6V5U5 =
|
// DDSPF_X8L8V8U8 = { sizeof(DDS_PIXELFORMAT), DDS_BUMPLUMINANCE, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0 };
|
||||||
{ 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)
|
// This indicates the DDS_HEADER_DXT10 extension is present (the format is in dxgiFormat)
|
||||||
DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_DX10 =
|
DDSGLOBALCONST DDS_PIXELFORMAT DDSPF_DX10 =
|
||||||
@ -288,43 +284,7 @@ namespace DirectX
|
|||||||
|
|
||||||
#pragma pack(pop)
|
#pragma pack(pop)
|
||||||
|
|
||||||
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) == 124, "DDS Header size mismatch");
|
||||||
static_assert(sizeof(DDS_HEADER_DXT10) == 20, "DDS DX10 Extended 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
|
} // namespace
|
||||||
|
|||||||
@ -47,49 +47,32 @@ struct IWICImagingFactory;
|
|||||||
struct IWICMetadataQueryReader;
|
struct IWICMetadataQueryReader;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DIRECTX_TEX_VERSION 208
|
#define DIRECTX_TEX_VERSION 199
|
||||||
|
|
||||||
#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
|
namespace DirectX
|
||||||
{
|
{
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------
|
||||||
// DXGI Format Utilities
|
// DXGI Format Utilities
|
||||||
DIRECTX_TEX_API constexpr bool __cdecl IsValid(_In_ DXGI_FORMAT fmt) noexcept;
|
constexpr bool __cdecl IsValid(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
DIRECTX_TEX_API bool __cdecl IsCompressed(_In_ DXGI_FORMAT fmt) noexcept;
|
bool __cdecl IsCompressed(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
DIRECTX_TEX_API bool __cdecl IsPacked(_In_ DXGI_FORMAT fmt) noexcept;
|
bool __cdecl IsPacked(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
DIRECTX_TEX_API bool __cdecl IsVideo(_In_ DXGI_FORMAT fmt) noexcept;
|
bool __cdecl IsVideo(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
DIRECTX_TEX_API bool __cdecl IsPlanar(_In_ DXGI_FORMAT fmt, _In_ bool isd3d12 = false) noexcept;
|
bool __cdecl IsPlanar(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
DIRECTX_TEX_API bool __cdecl IsPalettized(_In_ DXGI_FORMAT fmt) noexcept;
|
bool __cdecl IsPalettized(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
DIRECTX_TEX_API bool __cdecl IsDepthStencil(_In_ DXGI_FORMAT fmt) noexcept;
|
bool __cdecl IsDepthStencil(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
DIRECTX_TEX_API bool __cdecl IsSRGB(_In_ DXGI_FORMAT fmt) noexcept;
|
bool __cdecl IsSRGB(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
DIRECTX_TEX_API bool __cdecl IsBGR(_In_ DXGI_FORMAT fmt) noexcept;
|
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 IsTypeless(_In_ DXGI_FORMAT fmt, _In_ bool partialTypeless = true) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API bool __cdecl HasAlpha(_In_ DXGI_FORMAT fmt) noexcept;
|
bool __cdecl HasAlpha(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API size_t __cdecl BitsPerPixel(_In_ DXGI_FORMAT fmt) noexcept;
|
size_t __cdecl BitsPerPixel(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API size_t __cdecl BitsPerColor(_In_ DXGI_FORMAT fmt) noexcept;
|
size_t __cdecl BitsPerColor(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API size_t __cdecl BytesPerBlock(_In_ DXGI_FORMAT fmt) noexcept;
|
enum FORMAT_TYPE
|
||||||
|
|
||||||
enum FORMAT_TYPE : uint32_t
|
|
||||||
{
|
{
|
||||||
FORMAT_TYPE_TYPELESS,
|
FORMAT_TYPE_TYPELESS,
|
||||||
FORMAT_TYPE_FLOAT,
|
FORMAT_TYPE_FLOAT,
|
||||||
@ -99,9 +82,9 @@ namespace DirectX
|
|||||||
FORMAT_TYPE_SINT,
|
FORMAT_TYPE_SINT,
|
||||||
};
|
};
|
||||||
|
|
||||||
DIRECTX_TEX_API FORMAT_TYPE __cdecl FormatDataType(_In_ DXGI_FORMAT fmt) noexcept;
|
FORMAT_TYPE __cdecl FormatDataType(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
|
|
||||||
enum CP_FLAGS : uint32_t
|
enum CP_FLAGS : unsigned long
|
||||||
{
|
{
|
||||||
CP_FLAGS_NONE = 0x0,
|
CP_FLAGS_NONE = 0x0,
|
||||||
// Normal operation
|
// Normal operation
|
||||||
@ -132,26 +115,23 @@ namespace DirectX
|
|||||||
|
|
||||||
CP_FLAGS_8BPP = 0x40000,
|
CP_FLAGS_8BPP = 0x40000,
|
||||||
// Override with a legacy 8 bits-per-pixel format size
|
// 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)
|
|
||||||
};
|
};
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl ComputePitch(
|
HRESULT __cdecl ComputePitch(
|
||||||
_In_ DXGI_FORMAT fmt, _In_ size_t width, _In_ size_t height,
|
_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;
|
_Out_ size_t& rowPitch, _Out_ size_t& slicePitch, _In_ CP_FLAGS flags = CP_FLAGS_NONE) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API size_t __cdecl ComputeScanlines(_In_ DXGI_FORMAT fmt, _In_ size_t height) noexcept;
|
size_t __cdecl ComputeScanlines(_In_ DXGI_FORMAT fmt, _In_ size_t height) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API DXGI_FORMAT __cdecl MakeSRGB(_In_ DXGI_FORMAT fmt) noexcept;
|
DXGI_FORMAT __cdecl MakeSRGB(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
DIRECTX_TEX_API DXGI_FORMAT __cdecl MakeLinear(_In_ DXGI_FORMAT fmt) noexcept;
|
DXGI_FORMAT __cdecl MakeLinear(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
DIRECTX_TEX_API DXGI_FORMAT __cdecl MakeTypeless(_In_ DXGI_FORMAT fmt) noexcept;
|
DXGI_FORMAT __cdecl MakeTypeless(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
DIRECTX_TEX_API DXGI_FORMAT __cdecl MakeTypelessUNORM(_In_ DXGI_FORMAT fmt) noexcept;
|
DXGI_FORMAT __cdecl MakeTypelessUNORM(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
DIRECTX_TEX_API DXGI_FORMAT __cdecl MakeTypelessFLOAT(_In_ DXGI_FORMAT fmt) noexcept;
|
DXGI_FORMAT __cdecl MakeTypelessFLOAT(_In_ DXGI_FORMAT fmt) noexcept;
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------
|
||||||
// Texture metadata
|
// Texture metadata
|
||||||
enum TEX_DIMENSION : uint32_t
|
enum TEX_DIMENSION
|
||||||
// Subset here matches D3D10_RESOURCE_DIMENSION and D3D11_RESOURCE_DIMENSION
|
// Subset here matches D3D10_RESOURCE_DIMENSION and D3D11_RESOURCE_DIMENSION
|
||||||
{
|
{
|
||||||
TEX_DIMENSION_TEXTURE1D = 2,
|
TEX_DIMENSION_TEXTURE1D = 2,
|
||||||
@ -159,18 +139,18 @@ namespace DirectX
|
|||||||
TEX_DIMENSION_TEXTURE3D = 4,
|
TEX_DIMENSION_TEXTURE3D = 4,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum TEX_MISC_FLAG : uint32_t
|
enum TEX_MISC_FLAG : unsigned long
|
||||||
// Subset here matches D3D10_RESOURCE_MISC_FLAG and D3D11_RESOURCE_MISC_FLAG
|
// Subset here matches D3D10_RESOURCE_MISC_FLAG and D3D11_RESOURCE_MISC_FLAG
|
||||||
{
|
{
|
||||||
TEX_MISC_TEXTURECUBE = 0x4L,
|
TEX_MISC_TEXTURECUBE = 0x4L,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum TEX_MISC_FLAG2 : uint32_t
|
enum TEX_MISC_FLAG2 : unsigned long
|
||||||
{
|
{
|
||||||
TEX_MISC2_ALPHA_MODE_MASK = 0x7L,
|
TEX_MISC2_ALPHA_MODE_MASK = 0x7L,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum TEX_ALPHA_MODE : uint32_t
|
enum TEX_ALPHA_MODE
|
||||||
// Matches DDS_ALPHA_MODE, encoded in MISC_FLAGS2
|
// Matches DDS_ALPHA_MODE, encoded in MISC_FLAGS2
|
||||||
{
|
{
|
||||||
TEX_ALPHA_MODE_UNKNOWN = 0,
|
TEX_ALPHA_MODE_UNKNOWN = 0,
|
||||||
@ -180,7 +160,7 @@ namespace DirectX
|
|||||||
TEX_ALPHA_MODE_CUSTOM = 4,
|
TEX_ALPHA_MODE_CUSTOM = 4,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct DIRECTX_TEX_API TexMetadata
|
struct TexMetadata
|
||||||
{
|
{
|
||||||
size_t width;
|
size_t width;
|
||||||
size_t height; // Should be 1 for 1D textures
|
size_t height; // Should be 1 for 1D textures
|
||||||
@ -192,7 +172,7 @@ namespace DirectX
|
|||||||
DXGI_FORMAT format;
|
DXGI_FORMAT format;
|
||||||
TEX_DIMENSION dimension;
|
TEX_DIMENSION dimension;
|
||||||
|
|
||||||
size_t __cdecl ComputeIndex(size_t mip, size_t item, size_t slice) const noexcept;
|
size_t __cdecl ComputeIndex(_In_ size_t mip, _In_ size_t item, _In_ size_t slice) const noexcept;
|
||||||
// Returns size_t(-1) to indicate an out-of-range error
|
// Returns size_t(-1) to indicate an out-of-range error
|
||||||
|
|
||||||
bool __cdecl IsCubemap() const noexcept { return (miscFlags & TEX_MISC_TEXTURECUBE) != 0; }
|
bool __cdecl IsCubemap() const noexcept { return (miscFlags & TEX_MISC_TEXTURECUBE) != 0; }
|
||||||
@ -205,27 +185,9 @@ namespace DirectX
|
|||||||
|
|
||||||
bool __cdecl IsVolumemap() const noexcept { return (dimension == TEX_DIMENSION_TEXTURE3D); }
|
bool __cdecl IsVolumemap() const noexcept { return (dimension == TEX_DIMENSION_TEXTURE3D); }
|
||||||
// Helper for dimension
|
// 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 DIRECTX_TEX_API DDSMetaData
|
enum DDS_FLAGS : unsigned long
|
||||||
{
|
|
||||||
uint32_t size; // DDPIXELFORMAT.dwSize
|
|
||||||
uint32_t flags; // DDPIXELFORMAT.dwFlags
|
|
||||||
uint32_t fourCC; // DDPIXELFORMAT.dwFourCC
|
|
||||||
uint32_t RGBBitCount; // DDPIXELFORMAT.dwRGBBitCount/dwYUVBitCount/dwAlphaBitDepth/dwLuminanceBitCount/dwBumpBitCount
|
|
||||||
uint32_t RBitMask; // DDPIXELFORMAT.dwRBitMask/dwYBitMask/dwLuminanceBitMask/dwBumpDuBitMask
|
|
||||||
uint32_t GBitMask; // DDPIXELFORMAT.dwGBitMask/dwUBitMask/dwBumpDvBitMask
|
|
||||||
uint32_t BBitMask; // DDPIXELFORMAT.dwBBitMask/dwVBitMask/dwBumpLuminanceBitMask
|
|
||||||
uint32_t ABitMask; // DDPIXELFORMAT.dwRGBAlphaBitMask/dwYUVAlphaBitMask/dwLuminanceAlphaBitMask
|
|
||||||
|
|
||||||
bool __cdecl IsDX10() const noexcept { return (fourCC == 0x30315844); }
|
|
||||||
};
|
|
||||||
|
|
||||||
enum DDS_FLAGS : uint32_t
|
|
||||||
{
|
{
|
||||||
DDS_FLAGS_NONE = 0x0,
|
DDS_FLAGS_NONE = 0x0,
|
||||||
|
|
||||||
@ -250,12 +212,6 @@ namespace DirectX
|
|||||||
DDS_FLAGS_BAD_DXTN_TAILS = 0x40,
|
DDS_FLAGS_BAD_DXTN_TAILS = 0x40,
|
||||||
// Some older DXTn DDS files incorrectly handle mipchain tails for blocks smaller than 4x4
|
// Some older DXTn DDS files incorrectly handle mipchain tails for blocks smaller than 4x4
|
||||||
|
|
||||||
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,
|
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)
|
// Always use the 'DX10' header extension for DDS writer (i.e. don't try to write DX9 compatible DDS files)
|
||||||
|
|
||||||
@ -272,7 +228,7 @@ namespace DirectX
|
|||||||
// Enables the loader to read large dimension .dds files (i.e. greater than known hardware requirements)
|
// Enables the loader to read large dimension .dds files (i.e. greater than known hardware requirements)
|
||||||
};
|
};
|
||||||
|
|
||||||
enum TGA_FLAGS : uint32_t
|
enum TGA_FLAGS : unsigned long
|
||||||
{
|
{
|
||||||
TGA_FLAGS_NONE = 0x0,
|
TGA_FLAGS_NONE = 0x0,
|
||||||
|
|
||||||
@ -295,7 +251,7 @@ namespace DirectX
|
|||||||
// If no colorspace is specified in TGA 2.0 metadata, assume sRGB
|
// If no colorspace is specified in TGA 2.0 metadata, assume sRGB
|
||||||
};
|
};
|
||||||
|
|
||||||
enum WIC_FLAGS : uint32_t
|
enum WIC_FLAGS : unsigned long
|
||||||
{
|
{
|
||||||
WIC_FLAGS_NONE = 0x0,
|
WIC_FLAGS_NONE = 0x0,
|
||||||
|
|
||||||
@ -339,92 +295,53 @@ namespace DirectX
|
|||||||
// Filtering mode to use for any required image resizing (only needed when loading arrays of differently sized images; defaults to Fant)
|
// Filtering mode to use for any required image resizing (only needed when loading arrays of differently sized images; defaults to Fant)
|
||||||
};
|
};
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSMemory(
|
HRESULT __cdecl GetMetadataFromDDSMemory(
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
|
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
|
||||||
_In_ DDS_FLAGS flags,
|
_In_ DDS_FLAGS flags,
|
||||||
_Out_ TexMetadata& metadata) noexcept;
|
_Out_ TexMetadata& metadata) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSFile(
|
HRESULT __cdecl GetMetadataFromDDSFile(
|
||||||
_In_z_ const wchar_t* szFile,
|
_In_z_ const wchar_t* szFile,
|
||||||
_In_ DDS_FLAGS flags,
|
_In_ DDS_FLAGS flags,
|
||||||
_Out_ TexMetadata& metadata) noexcept;
|
_Out_ TexMetadata& metadata) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSMemoryEx(
|
HRESULT __cdecl GetMetadataFromHDRMemory(
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
|
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
|
||||||
_In_ DDS_FLAGS flags,
|
|
||||||
_Out_ TexMetadata& metadata,
|
|
||||||
_Out_opt_ DDSMetaData* ddPixelFormat) noexcept;
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromDDSFileEx(
|
|
||||||
_In_z_ const wchar_t* szFile,
|
|
||||||
_In_ DDS_FLAGS flags,
|
|
||||||
_Out_ TexMetadata& metadata,
|
|
||||||
_Out_opt_ DDSMetaData* ddPixelFormat) noexcept;
|
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromHDRMemory(
|
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
|
|
||||||
_Out_ TexMetadata& metadata) noexcept;
|
_Out_ TexMetadata& metadata) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromHDRFile(
|
HRESULT __cdecl GetMetadataFromHDRFile(
|
||||||
_In_z_ const wchar_t* szFile,
|
_In_z_ const wchar_t* szFile,
|
||||||
_Out_ TexMetadata& metadata) noexcept;
|
_Out_ TexMetadata& metadata) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromTGAMemory(
|
HRESULT __cdecl GetMetadataFromTGAMemory(
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
|
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
|
||||||
_In_ TGA_FLAGS flags,
|
_In_ TGA_FLAGS flags,
|
||||||
_Out_ TexMetadata& metadata) noexcept;
|
_Out_ TexMetadata& metadata) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromTGAFile(
|
HRESULT __cdecl GetMetadataFromTGAFile(
|
||||||
_In_z_ const wchar_t* szFile,
|
_In_z_ const wchar_t* szFile,
|
||||||
_In_ TGA_FLAGS flags,
|
_In_ TGA_FLAGS flags,
|
||||||
_Out_ TexMetadata& metadata) noexcept;
|
_Out_ TexMetadata& metadata) noexcept;
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromWICMemory(
|
HRESULT __cdecl GetMetadataFromWICMemory(
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
|
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
|
||||||
_In_ WIC_FLAGS flags,
|
_In_ WIC_FLAGS flags,
|
||||||
_Out_ TexMetadata& metadata,
|
_Out_ TexMetadata& metadata,
|
||||||
_In_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
|
_In_opt_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromWICFile(
|
HRESULT __cdecl GetMetadataFromWICFile(
|
||||||
_In_z_ const wchar_t* szFile,
|
_In_z_ const wchar_t* szFile,
|
||||||
_In_ WIC_FLAGS flags,
|
_In_ WIC_FLAGS flags,
|
||||||
_Out_ TexMetadata& metadata,
|
_Out_ TexMetadata& metadata,
|
||||||
_In_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
|
_In_opt_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Compatability helpers
|
// Compatability helpers
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromTGAMemory(
|
HRESULT __cdecl GetMetadataFromTGAMemory(
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
|
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
|
||||||
_Out_ TexMetadata& metadata) noexcept;
|
_Out_ TexMetadata& metadata) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GetMetadataFromTGAFile(
|
HRESULT __cdecl GetMetadataFromTGAFile(
|
||||||
_In_z_ const wchar_t* szFile,
|
_In_z_ const wchar_t* szFile,
|
||||||
_Out_ TexMetadata& metadata) noexcept;
|
_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
|
// Bitmap image container
|
||||||
struct Image
|
struct Image
|
||||||
@ -437,17 +354,13 @@ namespace DirectX
|
|||||||
uint8_t* pixels;
|
uint8_t* pixels;
|
||||||
};
|
};
|
||||||
|
|
||||||
class DIRECTX_TEX_API ScratchImage
|
class ScratchImage
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScratchImage() noexcept
|
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
|
ScratchImage(ScratchImage&& moveFrom) 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) { *this = std::move(moveFrom); }
|
||||||
{
|
|
||||||
*this = std::move(moveFrom);
|
|
||||||
}
|
|
||||||
~ScratchImage() { Release(); }
|
~ScratchImage() { Release(); }
|
||||||
|
|
||||||
ScratchImage& __cdecl operator= (ScratchImage&& moveFrom) noexcept;
|
ScratchImage& __cdecl operator= (ScratchImage&& moveFrom) noexcept;
|
||||||
@ -492,7 +405,7 @@ namespace DirectX
|
|||||||
|
|
||||||
//---------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------
|
||||||
// Memory blob (allocated buffer pointer is always 16-byte aligned)
|
// Memory blob (allocated buffer pointer is always 16-byte aligned)
|
||||||
class DIRECTX_TEX_API Blob
|
class Blob
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Blob() noexcept : m_buffer(nullptr), m_size(0) {}
|
Blob() noexcept : m_buffer(nullptr), m_size(0) {}
|
||||||
@ -508,10 +421,7 @@ namespace DirectX
|
|||||||
|
|
||||||
void __cdecl Release() noexcept;
|
void __cdecl Release() noexcept;
|
||||||
|
|
||||||
uint8_t* __cdecl GetBufferPointer() const noexcept { return m_buffer; }
|
void *__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; }
|
size_t __cdecl GetBufferSize() const noexcept { return m_size; }
|
||||||
|
|
||||||
HRESULT __cdecl Resize(size_t size) noexcept;
|
HRESULT __cdecl Resize(size_t size) noexcept;
|
||||||
@ -521,199 +431,113 @@ namespace DirectX
|
|||||||
// Shorten size without reallocation
|
// Shorten size without reallocation
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint8_t* m_buffer;
|
void* m_buffer;
|
||||||
size_t m_size;
|
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
|
// Image I/O
|
||||||
|
|
||||||
// DDS operations
|
// DDS operations
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSMemory(
|
HRESULT __cdecl LoadFromDDSMemory(
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
|
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
|
||||||
_In_ DDS_FLAGS flags,
|
_In_ DDS_FLAGS flags,
|
||||||
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSFile(
|
HRESULT __cdecl LoadFromDDSFile(
|
||||||
_In_z_ const wchar_t* szFile,
|
_In_z_ const wchar_t* szFile,
|
||||||
_In_ DDS_FLAGS flags,
|
_In_ DDS_FLAGS flags,
|
||||||
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromDDSMemoryEx(
|
HRESULT __cdecl SaveToDDSMemory(
|
||||||
_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;
|
|
||||||
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;
|
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToDDSMemory(
|
|
||||||
_In_ const Image& image,
|
_In_ const Image& image,
|
||||||
_In_ DDS_FLAGS flags,
|
_In_ DDS_FLAGS flags,
|
||||||
_Out_ Blob& blob) noexcept;
|
_Out_ Blob& blob) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToDDSMemory(
|
HRESULT __cdecl SaveToDDSMemory(
|
||||||
_In_reads_(nimages) const Image* images, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_In_reads_(nimages) const Image* images, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
||||||
_In_ DDS_FLAGS flags,
|
_In_ DDS_FLAGS flags,
|
||||||
_Out_ Blob& blob) noexcept;
|
_Out_ Blob& blob) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToDDSFile(_In_ const Image& image, _In_ DDS_FLAGS flags, _In_z_ const wchar_t* szFile) noexcept;
|
HRESULT __cdecl SaveToDDSFile(_In_ const Image& image, _In_ DDS_FLAGS flags, _In_z_ const wchar_t* szFile) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToDDSFile(
|
HRESULT __cdecl SaveToDDSFile(
|
||||||
_In_reads_(nimages) const Image* images, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_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;
|
_In_ DDS_FLAGS flags, _In_z_ const wchar_t* szFile) noexcept;
|
||||||
|
|
||||||
// HDR operations
|
// HDR operations
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromHDRMemory(
|
HRESULT __cdecl LoadFromHDRMemory(
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
|
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
|
||||||
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromHDRFile(
|
HRESULT __cdecl LoadFromHDRFile(
|
||||||
_In_z_ const wchar_t* szFile,
|
_In_z_ const wchar_t* szFile,
|
||||||
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToHDRMemory(_In_ const Image& image, _Out_ Blob& blob) noexcept;
|
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;
|
HRESULT __cdecl SaveToHDRFile(_In_ const Image& image, _In_z_ const wchar_t* szFile) noexcept;
|
||||||
|
|
||||||
// TGA operations
|
// TGA operations
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromTGAMemory(
|
HRESULT __cdecl LoadFromTGAMemory(
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
|
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
|
||||||
_In_ TGA_FLAGS flags,
|
_In_ TGA_FLAGS flags,
|
||||||
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromTGAFile(
|
HRESULT __cdecl LoadFromTGAFile(
|
||||||
_In_z_ const wchar_t* szFile,
|
_In_z_ const wchar_t* szFile,
|
||||||
_In_ TGA_FLAGS flags,
|
_In_ TGA_FLAGS flags,
|
||||||
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToTGAMemory(_In_ const Image& image,
|
HRESULT __cdecl SaveToTGAMemory(_In_ const Image& image,
|
||||||
_In_ TGA_FLAGS flags,
|
_In_ TGA_FLAGS flags,
|
||||||
_Out_ Blob& blob, _In_opt_ const TexMetadata* metadata = nullptr) noexcept;
|
_Out_ Blob& blob, _In_opt_ const TexMetadata* metadata = nullptr) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToTGAFile(_In_ const Image& image,
|
HRESULT __cdecl SaveToTGAFile(_In_ const Image& image,
|
||||||
_In_ TGA_FLAGS flags,
|
_In_ TGA_FLAGS flags,
|
||||||
_In_z_ const wchar_t* szFile, _In_opt_ const TexMetadata* metadata = nullptr) noexcept;
|
_In_z_ const wchar_t* szFile, _In_opt_ const TexMetadata* metadata = nullptr) noexcept;
|
||||||
|
|
||||||
// WIC operations
|
// WIC operations
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromWICMemory(
|
HRESULT __cdecl LoadFromWICMemory(
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
|
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
|
||||||
_In_ WIC_FLAGS flags,
|
_In_ WIC_FLAGS flags,
|
||||||
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image,
|
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image,
|
||||||
_In_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
|
_In_opt_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromWICFile(
|
HRESULT __cdecl LoadFromWICFile(
|
||||||
_In_z_ const wchar_t* szFile, _In_ WIC_FLAGS flags,
|
_In_z_ const wchar_t* szFile, _In_ WIC_FLAGS flags,
|
||||||
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image,
|
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image,
|
||||||
_In_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
|
_In_opt_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToWICMemory(
|
HRESULT __cdecl SaveToWICMemory(
|
||||||
_In_ const Image& image, _In_ WIC_FLAGS flags, _In_ REFGUID guidContainerFormat,
|
_In_ const Image& image, _In_ WIC_FLAGS flags, _In_ REFGUID guidContainerFormat,
|
||||||
_Out_ Blob& blob, _In_opt_ const GUID* targetFormat = nullptr,
|
_Out_ Blob& blob, _In_opt_ const GUID* targetFormat = nullptr,
|
||||||
_In_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
|
_In_opt_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToWICMemory(
|
HRESULT __cdecl SaveToWICMemory(
|
||||||
_In_count_(nimages) const Image* images, _In_ size_t nimages,
|
_In_count_(nimages) const Image* images, _In_ size_t nimages,
|
||||||
_In_ WIC_FLAGS flags, _In_ REFGUID guidContainerFormat,
|
_In_ WIC_FLAGS flags, _In_ REFGUID guidContainerFormat,
|
||||||
_Out_ Blob& blob, _In_opt_ const GUID* targetFormat = nullptr,
|
_Out_ Blob& blob, _In_opt_ const GUID* targetFormat = nullptr,
|
||||||
_In_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
|
_In_opt_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToWICFile(
|
HRESULT __cdecl SaveToWICFile(
|
||||||
_In_ const Image& image, _In_ WIC_FLAGS flags, _In_ REFGUID guidContainerFormat,
|
_In_ const Image& image, _In_ WIC_FLAGS flags, _In_ REFGUID guidContainerFormat,
|
||||||
_In_z_ const wchar_t* szFile, _In_opt_ const GUID* targetFormat = nullptr,
|
_In_z_ const wchar_t* szFile, _In_opt_ const GUID* targetFormat = nullptr,
|
||||||
_In_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
|
_In_opt_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToWICFile(
|
HRESULT __cdecl SaveToWICFile(
|
||||||
_In_count_(nimages) const Image* images, _In_ size_t nimages,
|
_In_count_(nimages) const Image* images, _In_ size_t nimages,
|
||||||
_In_ WIC_FLAGS flags, _In_ REFGUID guidContainerFormat,
|
_In_ WIC_FLAGS flags, _In_ REFGUID guidContainerFormat,
|
||||||
_In_z_ const wchar_t* szFile, _In_opt_ const GUID* targetFormat = nullptr,
|
_In_z_ const wchar_t* szFile, _In_opt_ const GUID* targetFormat = nullptr,
|
||||||
_In_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
|
_In_opt_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
|
||||||
#endif // WIN32
|
#endif // WIN32
|
||||||
|
|
||||||
// Compatability helpers
|
// Compatability helpers
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromTGAMemory(
|
HRESULT __cdecl LoadFromTGAMemory(
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
|
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
|
||||||
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl LoadFromTGAFile(
|
HRESULT __cdecl LoadFromTGAFile(
|
||||||
_In_z_ const wchar_t* szFile,
|
_In_z_ const wchar_t* szFile,
|
||||||
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl SaveToTGAMemory(_In_ const Image& image, _Out_ Blob& blob, _In_opt_ const TexMetadata* metadata = nullptr) noexcept;
|
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;
|
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
|
// Texture conversion, resizing, mipmap generation, and block compression
|
||||||
|
|
||||||
enum TEX_FR_FLAGS : uint32_t
|
enum TEX_FR_FLAGS : unsigned long
|
||||||
{
|
{
|
||||||
TEX_FR_ROTATE0 = 0x0,
|
TEX_FR_ROTATE0 = 0x0,
|
||||||
TEX_FR_ROTATE90 = 0x1,
|
TEX_FR_ROTATE90 = 0x1,
|
||||||
@ -724,14 +548,14 @@ namespace DirectX
|
|||||||
};
|
};
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
DIRECTX_TEX_API HRESULT __cdecl FlipRotate(_In_ const Image& srcImage, _In_ TEX_FR_FLAGS flags, _Out_ ScratchImage& image) noexcept;
|
HRESULT __cdecl FlipRotate(_In_ const Image& srcImage, _In_ TEX_FR_FLAGS flags, _Out_ ScratchImage& image) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl FlipRotate(
|
HRESULT __cdecl FlipRotate(
|
||||||
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
||||||
_In_ TEX_FR_FLAGS flags, _Out_ ScratchImage& result) noexcept;
|
_In_ TEX_FR_FLAGS flags, _Out_ ScratchImage& result) noexcept;
|
||||||
// Flip and/or rotate image
|
// Flip and/or rotate image
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
enum TEX_FILTER_FLAGS : uint32_t
|
enum TEX_FILTER_FLAGS : unsigned long
|
||||||
{
|
{
|
||||||
TEX_FILTER_DEFAULT = 0,
|
TEX_FILTER_DEFAULT = 0,
|
||||||
|
|
||||||
@ -785,15 +609,15 @@ namespace DirectX
|
|||||||
// Forces use of the WIC path even when logic would have picked a non-WIC path when both are an option
|
// Forces use of the WIC path even when logic would have picked a non-WIC path when both are an option
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr uint32_t TEX_FILTER_DITHER_MASK = 0xF0000;
|
constexpr unsigned long TEX_FILTER_DITHER_MASK = 0xF0000;
|
||||||
constexpr uint32_t TEX_FILTER_MODE_MASK = 0xF00000;
|
constexpr unsigned long TEX_FILTER_MODE_MASK = 0xF00000;
|
||||||
constexpr uint32_t TEX_FILTER_SRGB_MASK = 0xF000000;
|
constexpr unsigned long TEX_FILTER_SRGB_MASK = 0xF000000;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl Resize(
|
HRESULT __cdecl Resize(
|
||||||
_In_ const Image& srcImage, _In_ size_t width, _In_ size_t height,
|
_In_ const Image& srcImage, _In_ size_t width, _In_ size_t height,
|
||||||
_In_ TEX_FILTER_FLAGS filter,
|
_In_ TEX_FILTER_FLAGS filter,
|
||||||
_Out_ ScratchImage& image) noexcept;
|
_Out_ ScratchImage& image) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl Resize(
|
HRESULT __cdecl Resize(
|
||||||
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_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;
|
_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.
|
// Resize the image to width x height. Defaults to Fant filtering.
|
||||||
@ -802,59 +626,44 @@ namespace DirectX
|
|||||||
constexpr float TEX_THRESHOLD_DEFAULT = 0.5f;
|
constexpr float TEX_THRESHOLD_DEFAULT = 0.5f;
|
||||||
// Default value for alpha threshold used when converting to 1-bit alpha
|
// Default value for alpha threshold used when converting to 1-bit alpha
|
||||||
|
|
||||||
struct ConvertOptions
|
HRESULT __cdecl Convert(
|
||||||
{
|
|
||||||
TEX_FILTER_FLAGS filter;
|
|
||||||
float threshold;
|
|
||||||
};
|
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl Convert(
|
|
||||||
_In_ const Image& srcImage, _In_ DXGI_FORMAT format, _In_ TEX_FILTER_FLAGS filter, _In_ float threshold,
|
_In_ const Image& srcImage, _In_ DXGI_FORMAT format, _In_ TEX_FILTER_FLAGS filter, _In_ float threshold,
|
||||||
_Out_ ScratchImage& image) noexcept;
|
_Out_ ScratchImage& image) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl Convert(
|
HRESULT __cdecl Convert(
|
||||||
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_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;
|
_In_ DXGI_FORMAT format, _In_ TEX_FILTER_FLAGS filter, _In_ float threshold, _Out_ ScratchImage& result) noexcept;
|
||||||
|
|
||||||
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);
|
|
||||||
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
|
// Convert the image to a new format
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl ConvertToSinglePlane(_In_ const Image& srcImage, _Out_ ScratchImage& image) noexcept;
|
HRESULT __cdecl ConvertToSinglePlane(_In_ const Image& srcImage, _Out_ ScratchImage& image) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl ConvertToSinglePlane(
|
HRESULT __cdecl ConvertToSinglePlane(
|
||||||
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
||||||
_Out_ ScratchImage& image) noexcept;
|
_Out_ ScratchImage& image) noexcept;
|
||||||
// Converts the image from a planar format to an equivalent non-planar format
|
// Converts the image from a planar format to an equivalent non-planar format
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GenerateMipMaps(
|
HRESULT __cdecl GenerateMipMaps(
|
||||||
_In_ const Image& baseImage, _In_ TEX_FILTER_FLAGS filter, _In_ size_t levels,
|
_In_ const Image& baseImage, _In_ TEX_FILTER_FLAGS filter, _In_ size_t levels,
|
||||||
_Inout_ ScratchImage& mipChain, _In_ bool allow1D = false) noexcept;
|
_Inout_ ScratchImage& mipChain, _In_ bool allow1D = false) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GenerateMipMaps(
|
HRESULT __cdecl GenerateMipMaps(
|
||||||
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_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);
|
_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)
|
// 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
|
// Defaults to Fant filtering which is equivalent to a box filter
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GenerateMipMaps3D(
|
HRESULT __cdecl GenerateMipMaps3D(
|
||||||
_In_reads_(depth) const Image* baseImages, _In_ size_t depth, _In_ TEX_FILTER_FLAGS filter, _In_ size_t levels,
|
_In_reads_(depth) const Image* baseImages, _In_ size_t depth, _In_ TEX_FILTER_FLAGS filter, _In_ size_t levels,
|
||||||
_Out_ ScratchImage& mipChain) noexcept;
|
_Out_ ScratchImage& mipChain) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl GenerateMipMaps3D(
|
HRESULT __cdecl GenerateMipMaps3D(
|
||||||
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_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);
|
_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)
|
// 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
|
// Defaults to Fant filtering which is equivalent to a box filter
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl ScaleMipMapsAlphaForCoverage(
|
HRESULT __cdecl ScaleMipMapsAlphaForCoverage(
|
||||||
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata, _In_ size_t item,
|
_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;
|
_In_ float alphaReference, _Inout_ ScratchImage& mipChain) noexcept;
|
||||||
|
|
||||||
|
|
||||||
enum TEX_PMALPHA_FLAGS : uint32_t
|
enum TEX_PMALPHA_FLAGS : unsigned long
|
||||||
{
|
{
|
||||||
TEX_PMALPHA_DEFAULT = 0,
|
TEX_PMALPHA_DEFAULT = 0,
|
||||||
|
|
||||||
@ -871,13 +680,13 @@ namespace DirectX
|
|||||||
// if the output format type is IsSRGB(), then SRGB_OUT is on by default
|
// if the output format type is IsSRGB(), then SRGB_OUT is on by default
|
||||||
};
|
};
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl PremultiplyAlpha(_In_ const Image& srcImage, _In_ TEX_PMALPHA_FLAGS flags, _Out_ ScratchImage& image) noexcept;
|
HRESULT __cdecl PremultiplyAlpha(_In_ const Image& srcImage, _In_ TEX_PMALPHA_FLAGS flags, _Out_ ScratchImage& image) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl PremultiplyAlpha(
|
HRESULT __cdecl PremultiplyAlpha(
|
||||||
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
||||||
_In_ TEX_PMALPHA_FLAGS flags, _Out_ ScratchImage& result) noexcept;
|
_In_ TEX_PMALPHA_FLAGS flags, _Out_ ScratchImage& result) noexcept;
|
||||||
// Converts to/from a premultiplied alpha version of the texture
|
// Converts to/from a premultiplied alpha version of the texture
|
||||||
|
|
||||||
enum TEX_COMPRESS_FLAGS : uint32_t
|
enum TEX_COMPRESS_FLAGS : unsigned long
|
||||||
{
|
{
|
||||||
TEX_COMPRESS_DEFAULT = 0,
|
TEX_COMPRESS_DEFAULT = 0,
|
||||||
|
|
||||||
@ -909,61 +718,33 @@ namespace DirectX
|
|||||||
// Compress is free to use multithreading to improve performance (by default it does not use multithreading)
|
// Compress is free to use multithreading to improve performance (by default it does not use multithreading)
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr float TEX_ALPHA_WEIGHT_DEFAULT = 1.0f;
|
HRESULT __cdecl Compress(
|
||||||
// Default value for alpha weight used for GPU BC7 compression
|
|
||||||
|
|
||||||
struct CompressOptions
|
|
||||||
{
|
|
||||||
TEX_COMPRESS_FLAGS flags;
|
|
||||||
float threshold;
|
|
||||||
float alphaWeight;
|
|
||||||
};
|
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl Compress(
|
|
||||||
_In_ const Image& srcImage, _In_ DXGI_FORMAT format, _In_ TEX_COMPRESS_FLAGS compress, _In_ float threshold,
|
_In_ const Image& srcImage, _In_ DXGI_FORMAT format, _In_ TEX_COMPRESS_FLAGS compress, _In_ float threshold,
|
||||||
_Out_ ScratchImage& cImage) noexcept;
|
_Out_ ScratchImage& cImage) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl Compress(
|
HRESULT __cdecl Compress(
|
||||||
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_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;
|
_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
|
// Note that threshold is only used by BC1. TEX_THRESHOLD_DEFAULT is a typical value to use
|
||||||
|
|
||||||
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);
|
|
||||||
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__)
|
#if defined(__d3d11_h__) || defined(__d3d11_x_h__)
|
||||||
DIRECTX_TEX_API HRESULT __cdecl Compress(
|
HRESULT __cdecl Compress(
|
||||||
_In_ ID3D11Device* pDevice, _In_ const Image& srcImage, _In_ DXGI_FORMAT format, _In_ TEX_COMPRESS_FLAGS compress,
|
_In_ ID3D11Device* pDevice, _In_ const Image& srcImage, _In_ DXGI_FORMAT format, _In_ TEX_COMPRESS_FLAGS compress,
|
||||||
_In_ float alphaWeight, _Out_ ScratchImage& image) noexcept;
|
_In_ float alphaWeight, _Out_ ScratchImage& image) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl Compress(
|
HRESULT __cdecl Compress(
|
||||||
_In_ ID3D11Device* pDevice, _In_ const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_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;
|
_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)
|
// DirectCompute-based compression (alphaWeight is only used by BC7. 1.0 is the typical value to use)
|
||||||
|
|
||||||
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);
|
|
||||||
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
|
#endif
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl Decompress(_In_ const Image& cImage, _In_ DXGI_FORMAT format, _Out_ ScratchImage& image) noexcept;
|
HRESULT __cdecl Decompress(_In_ const Image& cImage, _In_ DXGI_FORMAT format, _Out_ ScratchImage& image) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl Decompress(
|
HRESULT __cdecl Decompress(
|
||||||
_In_reads_(nimages) const Image* cImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_In_reads_(nimages) const Image* cImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
||||||
_In_ DXGI_FORMAT format, _Out_ ScratchImage& images) noexcept;
|
_In_ DXGI_FORMAT format, _Out_ ScratchImage& images) noexcept;
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------
|
||||||
// Normal map operations
|
// Normal map operations
|
||||||
|
|
||||||
enum CNMAP_FLAGS : uint32_t
|
enum CNMAP_FLAGS : unsigned long
|
||||||
{
|
{
|
||||||
CNMAP_DEFAULT = 0,
|
CNMAP_DEFAULT = 0,
|
||||||
|
|
||||||
@ -987,17 +768,17 @@ namespace DirectX
|
|||||||
// Computes a crude occlusion term stored in the alpha channel
|
// Computes a crude occlusion term stored in the alpha channel
|
||||||
};
|
};
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl ComputeNormalMap(
|
HRESULT __cdecl ComputeNormalMap(
|
||||||
_In_ const Image& srcImage, _In_ CNMAP_FLAGS flags, _In_ float amplitude,
|
_In_ const Image& srcImage, _In_ CNMAP_FLAGS flags, _In_ float amplitude,
|
||||||
_In_ DXGI_FORMAT format, _Out_ ScratchImage& normalMap) noexcept;
|
_In_ DXGI_FORMAT format, _Out_ ScratchImage& normalMap) noexcept;
|
||||||
DIRECTX_TEX_API HRESULT __cdecl ComputeNormalMap(
|
HRESULT __cdecl ComputeNormalMap(
|
||||||
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_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;
|
_In_ CNMAP_FLAGS flags, _In_ float amplitude, _In_ DXGI_FORMAT format, _Out_ ScratchImage& normalMaps) noexcept;
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------
|
||||||
// Misc image operations
|
// Misc image operations
|
||||||
|
|
||||||
struct DIRECTX_TEX_API Rect
|
struct Rect
|
||||||
{
|
{
|
||||||
size_t x;
|
size_t x;
|
||||||
size_t y;
|
size_t y;
|
||||||
@ -1008,11 +789,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) {}
|
Rect(size_t _x, size_t _y, size_t _w, size_t _h) noexcept : x(_x), y(_y), w(_w), h(_h) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl CopyRectangle(
|
HRESULT __cdecl CopyRectangle(
|
||||||
_In_ const Image& srcImage, _In_ const Rect& srcRect, _In_ const Image& dstImage,
|
_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;
|
_In_ TEX_FILTER_FLAGS filter, _In_ size_t xOffset, _In_ size_t yOffset) noexcept;
|
||||||
|
|
||||||
enum CMSE_FLAGS : uint32_t
|
enum CMSE_FLAGS : unsigned long
|
||||||
{
|
{
|
||||||
CMSE_DEFAULT = 0,
|
CMSE_DEFAULT = 0,
|
||||||
|
|
||||||
@ -1031,21 +812,21 @@ namespace DirectX
|
|||||||
// Indicates that image should be scaled and biased before comparison (i.e. UNORM -> SNORM)
|
// Indicates that image should be scaled and biased before comparison (i.e. UNORM -> SNORM)
|
||||||
};
|
};
|
||||||
|
|
||||||
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 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 EvaluateImage(
|
HRESULT __cdecl EvaluateImage(
|
||||||
_In_ const Image& image,
|
_In_ const Image& image,
|
||||||
_In_ std::function<void __cdecl(_In_reads_(width) const XMVECTOR* pixels, size_t width, size_t y)> pixelFunc);
|
_In_ std::function<void __cdecl(_In_reads_(width) const XMVECTOR* pixels, size_t width, size_t y)> pixelFunc);
|
||||||
DIRECTX_TEX_API HRESULT __cdecl EvaluateImage(
|
HRESULT __cdecl EvaluateImage(
|
||||||
_In_reads_(nimages) const Image* images, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_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);
|
_In_ std::function<void __cdecl(_In_reads_(width) const XMVECTOR* pixels, size_t width, size_t y)> pixelFunc);
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl TransformImage(
|
HRESULT __cdecl TransformImage(
|
||||||
_In_ const Image& image,
|
_In_ const Image& image,
|
||||||
_In_ std::function<void __cdecl(_Out_writes_(width) XMVECTOR* outPixels,
|
_In_ std::function<void __cdecl(_Out_writes_(width) XMVECTOR* outPixels,
|
||||||
_In_reads_(width) const XMVECTOR* inPixels, size_t width, size_t y)> pixelFunc,
|
_In_reads_(width) const XMVECTOR* inPixels, size_t width, size_t y)> pixelFunc,
|
||||||
ScratchImage& result);
|
ScratchImage& result);
|
||||||
DIRECTX_TEX_API HRESULT __cdecl TransformImage(
|
HRESULT __cdecl TransformImage(
|
||||||
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_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_ std::function<void __cdecl(_Out_writes_(width) XMVECTOR* outPixels,
|
||||||
_In_reads_(width) const XMVECTOR* inPixels, size_t width, size_t y)> pixelFunc,
|
_In_reads_(width) const XMVECTOR* inPixels, size_t width, size_t y)> pixelFunc,
|
||||||
@ -1054,7 +835,7 @@ namespace DirectX
|
|||||||
//---------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------
|
||||||
// WIC utility code
|
// WIC utility code
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
enum WICCodecs : uint32_t
|
enum WICCodecs
|
||||||
{
|
{
|
||||||
WIC_CODEC_BMP = 1, // Windows Bitmap (.bmp)
|
WIC_CODEC_BMP = 1, // Windows Bitmap (.bmp)
|
||||||
WIC_CODEC_JPEG, // Joint Photographic Experts Group (.jpg, .jpeg)
|
WIC_CODEC_JPEG, // Joint Photographic Experts Group (.jpg, .jpeg)
|
||||||
@ -1066,31 +847,19 @@ namespace DirectX
|
|||||||
WIC_CODEC_HEIF, // High Efficiency Image File (.heif, .heic)
|
WIC_CODEC_HEIF, // High Efficiency Image File (.heif, .heic)
|
||||||
};
|
};
|
||||||
|
|
||||||
DIRECTX_TEX_API REFGUID __cdecl GetWICCodec(_In_ WICCodecs codec) noexcept;
|
REFGUID __cdecl GetWICCodec(_In_ WICCodecs codec) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API IWICImagingFactory* __cdecl GetWICFactory(bool& iswic2) noexcept;
|
IWICImagingFactory* __cdecl GetWICFactory(bool& iswic2) noexcept;
|
||||||
DIRECTX_TEX_API void __cdecl SetWICFactory(_In_opt_ IWICImagingFactory* pWIC) noexcept;
|
void __cdecl SetWICFactory(_In_opt_ IWICImagingFactory* pWIC) noexcept;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------
|
||||||
// DDS helper functions
|
// DDS helper functions
|
||||||
DIRECTX_TEX_API HRESULT __cdecl EncodeDDSHeader(
|
HRESULT __cdecl EncodeDDSHeader(
|
||||||
_In_ const TexMetadata& metadata, DDS_FLAGS flags,
|
_In_ const TexMetadata& metadata, DDS_FLAGS flags,
|
||||||
_Out_writes_bytes_to_opt_(maxsize, required) uint8_t* pDestination, _In_ size_t maxsize,
|
_Out_writes_bytes_to_opt_(maxsize, required) void* pDestination, _In_ size_t maxsize,
|
||||||
_Out_ size_t& required) noexcept;
|
_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
|
// Direct3D interop
|
||||||
|
|
||||||
@ -1103,48 +872,48 @@ namespace DirectX
|
|||||||
|
|
||||||
// Direct3D 11 functions
|
// Direct3D 11 functions
|
||||||
#if defined(__d3d11_h__) || defined(__d3d11_x_h__)
|
#if defined(__d3d11_h__) || defined(__d3d11_x_h__)
|
||||||
DIRECTX_TEX_API bool __cdecl IsSupportedTexture(_In_ ID3D11Device* pDevice, _In_ const TexMetadata& metadata) noexcept;
|
bool __cdecl IsSupportedTexture(_In_ ID3D11Device* pDevice, _In_ const TexMetadata& metadata) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl CreateTexture(
|
HRESULT __cdecl CreateTexture(
|
||||||
_In_ ID3D11Device* pDevice, _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_In_ ID3D11Device* pDevice, _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
||||||
_Outptr_ ID3D11Resource** ppResource) noexcept;
|
_Outptr_ ID3D11Resource** ppResource) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl CreateShaderResourceView(
|
HRESULT __cdecl CreateShaderResourceView(
|
||||||
_In_ ID3D11Device* pDevice, _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_In_ ID3D11Device* pDevice, _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
||||||
_Outptr_ ID3D11ShaderResourceView** ppSRV) noexcept;
|
_Outptr_ ID3D11ShaderResourceView** ppSRV) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl CreateTextureEx(
|
HRESULT __cdecl CreateTextureEx(
|
||||||
_In_ ID3D11Device* pDevice, _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_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,
|
_In_ D3D11_USAGE usage, _In_ unsigned int bindFlags, _In_ unsigned int cpuAccessFlags, _In_ unsigned int miscFlags, _In_ CREATETEX_FLAGS flags,
|
||||||
_Outptr_ ID3D11Resource** ppResource) noexcept;
|
_Outptr_ ID3D11Resource** ppResource) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl CreateShaderResourceViewEx(
|
HRESULT __cdecl CreateShaderResourceViewEx(
|
||||||
_In_ ID3D11Device* pDevice, _In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_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,
|
_In_ D3D11_USAGE usage, _In_ unsigned int bindFlags, _In_ unsigned int cpuAccessFlags, _In_ unsigned int miscFlags, _In_ CREATETEX_FLAGS flags,
|
||||||
_Outptr_ ID3D11ShaderResourceView** ppSRV) noexcept;
|
_Outptr_ ID3D11ShaderResourceView** ppSRV) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl CaptureTexture(_In_ ID3D11Device* pDevice, _In_ ID3D11DeviceContext* pContext, _In_ ID3D11Resource* pSource, _Out_ ScratchImage& result) noexcept;
|
HRESULT __cdecl CaptureTexture(_In_ ID3D11Device* pDevice, _In_ ID3D11DeviceContext* pContext, _In_ ID3D11Resource* pSource, _Out_ ScratchImage& result) noexcept;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Direct3D 12 functions
|
// Direct3D 12 functions
|
||||||
#if defined(__d3d12_h__) || defined(__d3d12_x_h__) || defined(__XBOX_D3D12_X__)
|
#if defined(__d3d12_h__) || defined(__d3d12_x_h__) || defined(__XBOX_D3D12_X__)
|
||||||
DIRECTX_TEX_API bool __cdecl IsSupportedTexture(_In_ ID3D12Device* pDevice, _In_ const TexMetadata& metadata) noexcept;
|
bool __cdecl IsSupportedTexture(_In_ ID3D12Device* pDevice, _In_ const TexMetadata& metadata) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl CreateTexture(
|
HRESULT __cdecl CreateTexture(
|
||||||
_In_ ID3D12Device* pDevice, _In_ const TexMetadata& metadata,
|
_In_ ID3D12Device* pDevice, _In_ const TexMetadata& metadata,
|
||||||
_Outptr_ ID3D12Resource** ppResource) noexcept;
|
_Outptr_ ID3D12Resource** ppResource) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl CreateTextureEx(
|
HRESULT __cdecl CreateTextureEx(
|
||||||
_In_ ID3D12Device* pDevice, _In_ const TexMetadata& metadata,
|
_In_ ID3D12Device* pDevice, _In_ const TexMetadata& metadata,
|
||||||
_In_ D3D12_RESOURCE_FLAGS resFlags, _In_ CREATETEX_FLAGS flags,
|
_In_ D3D12_RESOURCE_FLAGS resFlags, _In_ CREATETEX_FLAGS flags,
|
||||||
_Outptr_ ID3D12Resource** ppResource) noexcept;
|
_Outptr_ ID3D12Resource** ppResource) noexcept;
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl PrepareUpload(
|
HRESULT __cdecl PrepareUpload(
|
||||||
_In_ ID3D12Device* pDevice,
|
_In_ ID3D12Device* pDevice,
|
||||||
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata,
|
||||||
std::vector<D3D12_SUBRESOURCE_DATA>& subresources);
|
std::vector<D3D12_SUBRESOURCE_DATA>& subresources);
|
||||||
|
|
||||||
DIRECTX_TEX_API HRESULT __cdecl CaptureTexture(
|
HRESULT __cdecl CaptureTexture(
|
||||||
_In_ ID3D12CommandQueue* pCommandQueue, _In_ ID3D12Resource* pSource, _In_ bool isCubeMap,
|
_In_ ID3D12CommandQueue* pCommandQueue, _In_ ID3D12Resource* pSource, _In_ bool isCubeMap,
|
||||||
_Out_ ScratchImage& result,
|
_Out_ ScratchImage& result,
|
||||||
_In_ D3D12_RESOURCE_STATES beforeState = D3D12_RESOURCE_STATE_RENDER_TARGET,
|
_In_ D3D12_RESOURCE_STATES beforeState = D3D12_RESOURCE_STATE_RENDER_TARGET,
|
||||||
@ -1158,16 +927,12 @@ namespace DirectX
|
|||||||
#pragma clang diagnostic ignored "-Wswitch-enum"
|
#pragma clang diagnostic ignored "-Wswitch-enum"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning(push)
|
#pragma warning(push)
|
||||||
#pragma warning(disable : 4619 4616 4061)
|
#pragma warning(disable : 4619 4616 4061)
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "DirectXTex.inl"
|
#include "DirectXTex.inl"
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning(pop)
|
#pragma warning(pop)
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
#pragma clang diagnostic pop
|
#pragma clang diagnostic pop
|
||||||
|
|||||||
@ -14,12 +14,6 @@
|
|||||||
//=====================================================================================
|
//=====================================================================================
|
||||||
// Bitmask flags enumerator operators
|
// 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(CP_FLAGS);
|
||||||
DEFINE_ENUM_FLAG_OPERATORS(DDS_FLAGS);
|
DEFINE_ENUM_FLAG_OPERATORS(DDS_FLAGS);
|
||||||
DEFINE_ENUM_FLAG_OPERATORS(TGA_FLAGS);
|
DEFINE_ENUM_FLAG_OPERATORS(TGA_FLAGS);
|
||||||
@ -32,21 +26,17 @@ DEFINE_ENUM_FLAG_OPERATORS(CNMAP_FLAGS);
|
|||||||
DEFINE_ENUM_FLAG_OPERATORS(CMSE_FLAGS);
|
DEFINE_ENUM_FLAG_OPERATORS(CMSE_FLAGS);
|
||||||
DEFINE_ENUM_FLAG_OPERATORS(CREATETEX_FLAGS);
|
DEFINE_ENUM_FLAG_OPERATORS(CREATETEX_FLAGS);
|
||||||
|
|
||||||
#ifdef __clang__
|
|
||||||
#pragma clang diagnostic pop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// WIC_FILTER modes match TEX_FILTER modes
|
// 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<uint32_t>(a) | static_cast<uint32_t>(b & TEX_FILTER_MODE_MASK)); }
|
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<uint32_t>(a & TEX_FILTER_MODE_MASK) | static_cast<uint32_t>(b)); }
|
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)); }
|
||||||
|
|
||||||
// TEX_PMALPHA_SRGB match TEX_FILTER_SRGB
|
// 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<uint32_t>(a) | static_cast<uint32_t>(b & TEX_FILTER_SRGB_MASK)); }
|
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<uint32_t>(a & TEX_FILTER_SRGB_MASK) | static_cast<uint32_t>(b)); }
|
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)); }
|
||||||
|
|
||||||
// TEX_COMPRESS_SRGB match TEX_FILTER_SRGB
|
// 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<uint32_t>(a) | static_cast<uint32_t>(b & TEX_FILTER_SRGB_MASK)); }
|
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<uint32_t>(a & TEX_FILTER_SRGB_MASK) | static_cast<uint32_t>(b)); }
|
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)); }
|
||||||
|
|
||||||
|
|
||||||
//=====================================================================================
|
//=====================================================================================
|
||||||
@ -166,7 +156,7 @@ inline HRESULT __cdecl SaveToDDSFile(const Image& image, DDS_FLAGS flags, const
|
|||||||
// Compatability helpers
|
// Compatability helpers
|
||||||
//=====================================================================================
|
//=====================================================================================
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
inline HRESULT __cdecl GetMetadataFromTGAMemory(const uint8_t* pSource, size_t size, TexMetadata& metadata) noexcept
|
inline HRESULT __cdecl GetMetadataFromTGAMemory(const void* pSource, size_t size, TexMetadata& metadata) noexcept
|
||||||
{
|
{
|
||||||
return GetMetadataFromTGAMemory(pSource, size, TGA_FLAGS_NONE, metadata);
|
return GetMetadataFromTGAMemory(pSource, size, TGA_FLAGS_NONE, metadata);
|
||||||
}
|
}
|
||||||
@ -178,7 +168,7 @@ inline HRESULT __cdecl GetMetadataFromTGAFile(const wchar_t* szFile, TexMetadata
|
|||||||
}
|
}
|
||||||
|
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
inline HRESULT __cdecl LoadFromTGAMemory(const uint8_t* pSource, size_t size, TexMetadata* metadata, ScratchImage& image) noexcept
|
inline HRESULT __cdecl LoadFromTGAMemory(const void* pSource, size_t size, TexMetadata* metadata, ScratchImage& image) noexcept
|
||||||
{
|
{
|
||||||
return LoadFromTGAMemory(pSource, size, TGA_FLAGS_NONE, metadata, image);
|
return LoadFromTGAMemory(pSource, size, TGA_FLAGS_NONE, metadata, image);
|
||||||
}
|
}
|
||||||
@ -200,85 +190,3 @@ inline HRESULT __cdecl SaveToTGAFile(const Image& image, const wchar_t* szFile,
|
|||||||
{
|
{
|
||||||
return SaveToTGAFile(image, TGA_FLAGS_NONE, szFile, metadata);
|
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
|
|
||||||
|
|||||||
@ -74,8 +74,7 @@ namespace
|
|||||||
const Image& result,
|
const Image& result,
|
||||||
uint32_t bcflags,
|
uint32_t bcflags,
|
||||||
TEX_FILTER_FLAGS srgb,
|
TEX_FILTER_FLAGS srgb,
|
||||||
float threshold,
|
float threshold) noexcept
|
||||||
const std::function<bool __cdecl(size_t, size_t)>& statusCallback) noexcept
|
|
||||||
{
|
{
|
||||||
if (!image.pixels || !result.pixels)
|
if (!image.pixels || !result.pixels)
|
||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
@ -112,14 +111,6 @@ namespace
|
|||||||
const size_t rowPitch = image.rowPitch;
|
const size_t rowPitch = image.rowPitch;
|
||||||
for (size_t h = 0; h < image.height; h += 4)
|
for (size_t h = 0; h < image.height; h += 4)
|
||||||
{
|
{
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(h, image.height))
|
|
||||||
{
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const uint8_t *sptr = pSrc;
|
const uint8_t *sptr = pSrc;
|
||||||
uint8_t* dptr = pDest;
|
uint8_t* dptr = pDest;
|
||||||
const size_t ph = std::min<size_t>(4, image.height - h);
|
const size_t ph = std::min<size_t>(4, image.height - h);
|
||||||
@ -212,8 +203,7 @@ namespace
|
|||||||
const Image& result,
|
const Image& result,
|
||||||
uint32_t bcflags,
|
uint32_t bcflags,
|
||||||
TEX_FILTER_FLAGS srgb,
|
TEX_FILTER_FLAGS srgb,
|
||||||
float threshold,
|
float threshold) noexcept
|
||||||
const std::function<bool __cdecl(size_t, size_t)>& statusCallback) noexcept
|
|
||||||
{
|
{
|
||||||
if (!image.pixels || !result.pixels)
|
if (!image.pixels || !result.pixels)
|
||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
@ -249,22 +239,9 @@ namespace
|
|||||||
|
|
||||||
bool fail = false;
|
bool fail = false;
|
||||||
|
|
||||||
size_t progress = 0;
|
#pragma omp parallel for
|
||||||
bool abort = false;
|
|
||||||
|
|
||||||
const size_t progressTotal = std::max<size_t>(1, (image.height + 3) / 4);
|
|
||||||
|
|
||||||
#pragma omp parallel for shared(progress)
|
|
||||||
for (int nb = 0; nb < static_cast<int>(nBlocks); ++nb)
|
for (int nb = 0; nb < static_cast<int>(nBlocks); ++nb)
|
||||||
{
|
{
|
||||||
#pragma omp flush (abort)
|
|
||||||
if (abort)
|
|
||||||
{
|
|
||||||
// Short circuit the loop body if an abort is requested.
|
|
||||||
// OpenMP 2.0 does not support cancellation of a 'parallel for' loop.
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const int nbWidth = std::max<int>(1, int((image.width + 3) / 4));
|
const int nbWidth = std::max<int>(1, int((image.width + 3) / 4));
|
||||||
|
|
||||||
int y = nb / nbWidth;
|
int y = nb / nbWidth;
|
||||||
@ -346,30 +323,10 @@ namespace
|
|||||||
pfEncode(pDest, temp, bcflags);
|
pfEncode(pDest, temp, bcflags);
|
||||||
else
|
else
|
||||||
D3DXEncodeBC1(pDest, temp, threshold, bcflags);
|
D3DXEncodeBC1(pDest, temp, threshold, bcflags);
|
||||||
|
|
||||||
// Report progress when a new row is reached.
|
|
||||||
if (x == 0 && statusCallback)
|
|
||||||
{
|
|
||||||
#pragma omp atomic
|
|
||||||
progress += 4;
|
|
||||||
|
|
||||||
if (!statusCallback(progress, progressTotal))
|
|
||||||
{
|
|
||||||
abort = true;
|
|
||||||
#pragma omp flush (abort)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (abort)
|
|
||||||
{
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return (fail) ? E_FAIL : S_OK;
|
return (fail) ? E_FAIL : S_OK;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
#endif // _OPENMP
|
#endif // _OPENMP
|
||||||
|
|
||||||
|
|
||||||
@ -635,38 +592,6 @@ HRESULT DirectX::Compress(
|
|||||||
TEX_COMPRESS_FLAGS compress,
|
TEX_COMPRESS_FLAGS compress,
|
||||||
float threshold,
|
float threshold,
|
||||||
ScratchImage& image) noexcept
|
ScratchImage& image) noexcept
|
||||||
{
|
|
||||||
CompressOptions options = {};
|
|
||||||
options.flags = compress;
|
|
||||||
options.threshold = threshold;
|
|
||||||
|
|
||||||
return CompressEx(srcImage, format, options, image, nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT DirectX::Compress(
|
|
||||||
const Image* srcImages,
|
|
||||||
size_t nimages,
|
|
||||||
const TexMetadata& metadata,
|
|
||||||
DXGI_FORMAT format,
|
|
||||||
TEX_COMPRESS_FLAGS compress,
|
|
||||||
float threshold,
|
|
||||||
ScratchImage& cImages) noexcept
|
|
||||||
{
|
|
||||||
CompressOptions options = {};
|
|
||||||
options.flags = compress;
|
|
||||||
options.threshold = threshold;
|
|
||||||
|
|
||||||
return CompressEx(srcImages, nimages, metadata, format, options, cImages, nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT DirectX::CompressEx(
|
|
||||||
const Image& srcImage,
|
|
||||||
DXGI_FORMAT format,
|
|
||||||
const CompressOptions& options,
|
|
||||||
ScratchImage& image,
|
|
||||||
std::function<bool __cdecl(size_t, size_t)> statusCallback)
|
|
||||||
{
|
{
|
||||||
if (IsCompressed(srcImage.format) || !IsCompressed(format))
|
if (IsCompressed(srcImage.format) || !IsCompressed(format))
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
@ -687,56 +612,35 @@ HRESULT DirectX::CompressEx(
|
|||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(0, img->height))
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compress single image
|
// Compress single image
|
||||||
if (options.flags & TEX_COMPRESS_PARALLEL)
|
if (compress & TEX_COMPRESS_PARALLEL)
|
||||||
{
|
{
|
||||||
#ifndef _OPENMP
|
#ifndef _OPENMP
|
||||||
hr = E_NOTIMPL;
|
return E_NOTIMPL;
|
||||||
#else
|
#else
|
||||||
hr = CompressBC_Parallel(srcImage, *img, GetBCFlags(options.flags), GetSRGBFlags(options.flags), options.threshold, statusCallback);
|
hr = CompressBC_Parallel(srcImage, *img, GetBCFlags(compress), GetSRGBFlags(compress), threshold);
|
||||||
#endif // _OPENMP
|
#endif // _OPENMP
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
hr = CompressBC(srcImage, *img, GetBCFlags(options.flags), GetSRGBFlags(options.flags), options.threshold, statusCallback);
|
hr = CompressBC(srcImage, *img, GetBCFlags(compress), GetSRGBFlags(compress), threshold);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
|
||||||
image.Release();
|
image.Release();
|
||||||
|
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(img->height, img->height))
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
HRESULT DirectX::CompressEx(
|
HRESULT DirectX::Compress(
|
||||||
const Image* srcImages,
|
const Image* srcImages,
|
||||||
size_t nimages,
|
size_t nimages,
|
||||||
const TexMetadata& metadata,
|
const TexMetadata& metadata,
|
||||||
DXGI_FORMAT format,
|
DXGI_FORMAT format,
|
||||||
const CompressOptions& options,
|
TEX_COMPRESS_FLAGS compress,
|
||||||
ScratchImage& cImages,
|
float threshold,
|
||||||
std::function<bool __cdecl(size_t, size_t)> statusCallback)
|
ScratchImage& cImages) noexcept
|
||||||
{
|
{
|
||||||
if (!srcImages || !nimages)
|
if (!srcImages || !nimages)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
@ -750,19 +654,6 @@ HRESULT DirectX::CompressEx(
|
|||||||
|
|
||||||
cImages.Release();
|
cImages.Release();
|
||||||
|
|
||||||
if (statusCallback
|
|
||||||
&& nimages == 1
|
|
||||||
&& !metadata.IsVolumemap()
|
|
||||||
&& metadata.mipLevels == 1
|
|
||||||
&& metadata.arraySize == 1)
|
|
||||||
{
|
|
||||||
// If progress reporting is requested when compressing a single 1D or 2D image, call
|
|
||||||
// the CompressEx overload that takes a single image.
|
|
||||||
// This provides a better user experience as progress will be reported as the image
|
|
||||||
// is being processed, instead of after processing has been completed.
|
|
||||||
return CompressEx(srcImages[0], format, options, cImages, statusCallback);
|
|
||||||
}
|
|
||||||
|
|
||||||
TexMetadata mdata2 = metadata;
|
TexMetadata mdata2 = metadata;
|
||||||
mdata2.format = format;
|
mdata2.format = format;
|
||||||
HRESULT hr = cImages.Initialize(mdata2);
|
HRESULT hr = cImages.Initialize(mdata2);
|
||||||
@ -782,15 +673,6 @@ HRESULT DirectX::CompressEx(
|
|||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(0, nimages))
|
|
||||||
{
|
|
||||||
cImages.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (size_t index = 0; index < nimages; ++index)
|
for (size_t index = 0; index < nimages; ++index)
|
||||||
{
|
{
|
||||||
assert(dest[index].format == format);
|
assert(dest[index].format == format);
|
||||||
@ -803,44 +685,33 @@ HRESULT DirectX::CompressEx(
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.flags & TEX_COMPRESS_PARALLEL)
|
if ((compress & TEX_COMPRESS_PARALLEL))
|
||||||
{
|
{
|
||||||
#ifndef _OPENMP
|
#ifndef _OPENMP
|
||||||
hr = E_NOTIMPL;
|
return E_NOTIMPL;
|
||||||
#else
|
#else
|
||||||
hr = CompressBC_Parallel(src, dest[index], GetBCFlags(options.flags), GetSRGBFlags(options.flags), options.threshold, nullptr);
|
if (compress & TEX_COMPRESS_PARALLEL)
|
||||||
#endif // _OPENMP
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
hr = CompressBC(src, dest[index], GetBCFlags(options.flags), GetSRGBFlags(options.flags), options.threshold, nullptr);
|
hr = CompressBC_Parallel(src, dest[index], GetBCFlags(compress), GetSRGBFlags(compress), threshold);
|
||||||
}
|
|
||||||
|
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
cImages.Release();
|
cImages.Release();
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (statusCallback)
|
#endif // _OPENMP
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
if (!statusCallback(index, nimages))
|
hr = CompressBC(src, dest[index], GetBCFlags(compress), GetSRGBFlags(compress), threshold);
|
||||||
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
cImages.Release();
|
cImages.Release();
|
||||||
return E_ABORT;
|
return hr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(nimages, nimages))
|
|
||||||
{
|
|
||||||
cImages.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -172,7 +172,7 @@ namespace
|
|||||||
ScratchImage image;
|
ScratchImage image;
|
||||||
HRESULT hr = E_UNEXPECTED;
|
HRESULT hr = E_UNEXPECTED;
|
||||||
|
|
||||||
const auto srgb = GetSRGBFlags(compress);
|
auto const srgb = GetSRGBFlags(compress);
|
||||||
|
|
||||||
switch (tformat)
|
switch (tformat)
|
||||||
{
|
{
|
||||||
@ -219,40 +219,6 @@ HRESULT DirectX::Compress(
|
|||||||
TEX_COMPRESS_FLAGS compress,
|
TEX_COMPRESS_FLAGS compress,
|
||||||
float alphaWeight,
|
float alphaWeight,
|
||||||
ScratchImage& image) noexcept
|
ScratchImage& image) noexcept
|
||||||
{
|
|
||||||
CompressOptions options = {};
|
|
||||||
options.flags = compress;
|
|
||||||
options.alphaWeight = alphaWeight;
|
|
||||||
|
|
||||||
return CompressEx(pDevice, srcImage, format, options, image, nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT DirectX::Compress(
|
|
||||||
ID3D11Device* pDevice,
|
|
||||||
const Image* srcImages,
|
|
||||||
size_t nimages,
|
|
||||||
const TexMetadata& metadata,
|
|
||||||
DXGI_FORMAT format,
|
|
||||||
TEX_COMPRESS_FLAGS compress,
|
|
||||||
float alphaWeight,
|
|
||||||
ScratchImage& cImages) noexcept
|
|
||||||
{
|
|
||||||
CompressOptions options = {};
|
|
||||||
options.flags = compress;
|
|
||||||
options.alphaWeight = alphaWeight;
|
|
||||||
|
|
||||||
return CompressEx(pDevice, srcImages, nimages, metadata, format, options, cImages);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT DirectX::CompressEx(
|
|
||||||
ID3D11Device* pDevice,
|
|
||||||
const Image& srcImage,
|
|
||||||
DXGI_FORMAT format,
|
|
||||||
const CompressOptions& options,
|
|
||||||
ScratchImage& image,
|
|
||||||
std::function<bool __cdecl(size_t, size_t)> statusCallback)
|
|
||||||
{
|
{
|
||||||
if (!pDevice || IsCompressed(srcImage.format) || !IsCompressed(format))
|
if (!pDevice || IsCompressed(srcImage.format) || !IsCompressed(format))
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
@ -261,9 +227,6 @@ HRESULT DirectX::CompressEx(
|
|||||||
|| IsTypeless(srcImage.format) || IsPlanar(srcImage.format) || IsPalettized(srcImage.format))
|
|| IsTypeless(srcImage.format) || IsPlanar(srcImage.format) || IsPalettized(srcImage.format))
|
||||||
return HRESULT_E_NOT_SUPPORTED;
|
return HRESULT_E_NOT_SUPPORTED;
|
||||||
|
|
||||||
if (!srcImage.pixels)
|
|
||||||
return E_POINTER;
|
|
||||||
|
|
||||||
// Setup GPU compressor
|
// Setup GPU compressor
|
||||||
std::unique_ptr<GPUCompressBC> gpubc(new (std::nothrow) GPUCompressBC);
|
std::unique_ptr<GPUCompressBC> gpubc(new (std::nothrow) GPUCompressBC);
|
||||||
if (!gpubc)
|
if (!gpubc)
|
||||||
@ -273,7 +236,7 @@ HRESULT DirectX::CompressEx(
|
|||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
hr = gpubc->Prepare(srcImage.width, srcImage.height, options.flags, format, options.alphaWeight);
|
hr = gpubc->Prepare(srcImage.width, srcImage.height, compress, format, alphaWeight);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
@ -289,45 +252,23 @@ HRESULT DirectX::CompressEx(
|
|||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
hr = GPUCompress(gpubc.get(), srcImage, *img, compress);
|
||||||
{
|
|
||||||
if (!statusCallback(0, 100))
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = GPUCompress(gpubc.get(), srcImage, *img, options.flags);
|
|
||||||
|
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
|
||||||
image.Release();
|
image.Release();
|
||||||
|
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(100, 100))
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
HRESULT DirectX::CompressEx(
|
HRESULT DirectX::Compress(
|
||||||
ID3D11Device* pDevice,
|
ID3D11Device* pDevice,
|
||||||
const Image* srcImages,
|
const Image* srcImages,
|
||||||
size_t nimages,
|
size_t nimages,
|
||||||
const TexMetadata& metadata,
|
const TexMetadata& metadata,
|
||||||
DXGI_FORMAT format,
|
DXGI_FORMAT format,
|
||||||
const CompressOptions& options,
|
TEX_COMPRESS_FLAGS compress,
|
||||||
ScratchImage& cImages,
|
float alphaWeight,
|
||||||
std::function<bool __cdecl(size_t, size_t)> statusCallback)
|
ScratchImage& cImages) noexcept
|
||||||
{
|
{
|
||||||
if (!pDevice || !srcImages || !nimages)
|
if (!pDevice || !srcImages || !nimages)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
@ -370,15 +311,6 @@ HRESULT DirectX::CompressEx(
|
|||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(0, nimages))
|
|
||||||
{
|
|
||||||
cImages.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process images (ordered by size)
|
// Process images (ordered by size)
|
||||||
switch (metadata.dimension)
|
switch (metadata.dimension)
|
||||||
{
|
{
|
||||||
@ -387,11 +319,10 @@ HRESULT DirectX::CompressEx(
|
|||||||
{
|
{
|
||||||
size_t w = metadata.width;
|
size_t w = metadata.width;
|
||||||
size_t h = metadata.height;
|
size_t h = metadata.height;
|
||||||
size_t progress = 0;
|
|
||||||
|
|
||||||
for (size_t level = 0; level < metadata.mipLevels; ++level)
|
for (size_t level = 0; level < metadata.mipLevels; ++level)
|
||||||
{
|
{
|
||||||
hr = gpubc->Prepare(w, h, options.flags, format, options.alphaWeight);
|
hr = gpubc->Prepare(w, h, compress, format, alphaWeight);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
cImages.Release();
|
cImages.Release();
|
||||||
@ -417,21 +348,12 @@ HRESULT DirectX::CompressEx(
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = GPUCompress(gpubc.get(), src, dest[index], options.flags);
|
hr = GPUCompress(gpubc.get(), src, dest[index], compress);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
cImages.Release();
|
cImages.Release();
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(progress++, nimages))
|
|
||||||
{
|
|
||||||
cImages.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (h > 1)
|
if (h > 1)
|
||||||
@ -448,11 +370,10 @@ HRESULT DirectX::CompressEx(
|
|||||||
size_t w = metadata.width;
|
size_t w = metadata.width;
|
||||||
size_t h = metadata.height;
|
size_t h = metadata.height;
|
||||||
size_t d = metadata.depth;
|
size_t d = metadata.depth;
|
||||||
size_t progress = 0;
|
|
||||||
|
|
||||||
for (size_t level = 0; level < metadata.mipLevels; ++level)
|
for (size_t level = 0; level < metadata.mipLevels; ++level)
|
||||||
{
|
{
|
||||||
hr = gpubc->Prepare(w, h, options.flags, format, options.alphaWeight);
|
hr = gpubc->Prepare(w, h, compress, format, alphaWeight);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
cImages.Release();
|
cImages.Release();
|
||||||
@ -478,21 +399,12 @@ HRESULT DirectX::CompressEx(
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = GPUCompress(gpubc.get(), src, dest[index], options.flags);
|
hr = GPUCompress(gpubc.get(), src, dest[index], compress);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
cImages.Release();
|
cImages.Release();
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(progress++, nimages))
|
|
||||||
{
|
|
||||||
cImages.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (h > 1)
|
if (h > 1)
|
||||||
@ -511,14 +423,5 @@ HRESULT DirectX::CompressEx(
|
|||||||
return HRESULT_E_NOT_SUPPORTED;
|
return HRESULT_E_NOT_SUPPORTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(nimages, nimages))
|
|
||||||
{
|
|
||||||
cImages.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -415,9 +415,6 @@ void DirectX::Internal::CopyScanline(
|
|||||||
case DXGI_FORMAT_A8_UNORM:
|
case DXGI_FORMAT_A8_UNORM:
|
||||||
memset(pDestination, 0xff, outSize);
|
memset(pDestination, 0xff, outSize);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -589,9 +586,6 @@ void DirectX::Internal::SwizzleScanline(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall-through case is to just use memcpy (assuming this is not an in-place operation)
|
// Fall-through case is to just use memcpy (assuming this is not an in-place operation)
|
||||||
@ -983,8 +977,8 @@ _Use_decl_annotations_ bool DirectX::Internal::LoadScanline(
|
|||||||
auto sPtr = static_cast<const uint32_t*>(pSource);
|
auto sPtr = static_cast<const uint32_t*>(pSource);
|
||||||
for (size_t icount = 0; icount < (size - sizeof(uint32_t) + 1); icount += sizeof(uint32_t))
|
for (size_t icount = 0; icount < (size - sizeof(uint32_t) + 1); icount += sizeof(uint32_t))
|
||||||
{
|
{
|
||||||
const auto d = static_cast<float>(*sPtr & 0xFFFFFF) / 16777215.f;
|
auto const d = static_cast<float>(*sPtr & 0xFFFFFF) / 16777215.f;
|
||||||
const auto s = static_cast<float>((*sPtr & 0xFF000000) >> 24);
|
auto const s = static_cast<float>((*sPtr & 0xFF000000) >> 24);
|
||||||
++sPtr;
|
++sPtr;
|
||||||
if (dPtr >= ePtr) break;
|
if (dPtr >= ePtr) break;
|
||||||
*(dPtr++) = XMVectorSet(d, s, 0.f, 1.f);
|
*(dPtr++) = XMVectorSet(d, s, 0.f, 1.f);
|
||||||
@ -999,7 +993,7 @@ _Use_decl_annotations_ bool DirectX::Internal::LoadScanline(
|
|||||||
auto sPtr = static_cast<const uint32_t*>(pSource);
|
auto sPtr = static_cast<const uint32_t*>(pSource);
|
||||||
for (size_t icount = 0; icount < (size - sizeof(uint32_t) + 1); icount += sizeof(uint32_t))
|
for (size_t icount = 0; icount < (size - sizeof(uint32_t) + 1); icount += sizeof(uint32_t))
|
||||||
{
|
{
|
||||||
const auto r = static_cast<float>(*sPtr & 0xFFFFFF) / 16777215.f;
|
auto const r = static_cast<float>(*sPtr & 0xFFFFFF) / 16777215.f;
|
||||||
++sPtr;
|
++sPtr;
|
||||||
if (dPtr >= ePtr) break;
|
if (dPtr >= ePtr) break;
|
||||||
*(dPtr++) = XMVectorSet(r, 0.f /* typeless component assumed zero */, 0.f, 1.f);
|
*(dPtr++) = XMVectorSet(r, 0.f /* typeless component assumed zero */, 0.f, 1.f);
|
||||||
@ -1014,7 +1008,7 @@ _Use_decl_annotations_ bool DirectX::Internal::LoadScanline(
|
|||||||
auto sPtr = static_cast<const uint32_t*>(pSource);
|
auto sPtr = static_cast<const uint32_t*>(pSource);
|
||||||
for (size_t icount = 0; icount < (size - sizeof(uint32_t) + 1); icount += sizeof(uint32_t))
|
for (size_t icount = 0; icount < (size - sizeof(uint32_t) + 1); icount += sizeof(uint32_t))
|
||||||
{
|
{
|
||||||
const auto g = static_cast<float>((*sPtr & 0xFF000000) >> 24);
|
auto const g = static_cast<float>((*sPtr & 0xFF000000) >> 24);
|
||||||
++sPtr;
|
++sPtr;
|
||||||
if (dPtr >= ePtr) break;
|
if (dPtr >= ePtr) break;
|
||||||
*(dPtr++) = XMVectorSet(0.f /* typeless component assumed zero */, g, 0.f, 1.f);
|
*(dPtr++) = XMVectorSet(0.f /* typeless component assumed zero */, g, 0.f, 1.f);
|
||||||
@ -1344,9 +1338,9 @@ _Use_decl_annotations_ bool DirectX::Internal::LoadScanline(
|
|||||||
// G = 1.1678Y' - 0.3929Cb' - 0.8152Cr'
|
// G = 1.1678Y' - 0.3929Cb' - 0.8152Cr'
|
||||||
// B = 1.1678Y' + 2.0232Cb'
|
// B = 1.1678Y' + 2.0232Cb'
|
||||||
|
|
||||||
const auto r = static_cast<int>((76533 * y + 104905 * v + 32768) >> 16);
|
auto const r = static_cast<int>((76533 * y + 104905 * v + 32768) >> 16);
|
||||||
const auto g = static_cast<int>((76533 * y - 25747 * u - 53425 * v + 32768) >> 16);
|
auto const g = static_cast<int>((76533 * y - 25747 * u - 53425 * v + 32768) >> 16);
|
||||||
const auto b = static_cast<int>((76533 * y + 132590 * u + 32768) >> 16);
|
auto const b = static_cast<int>((76533 * y + 132590 * u + 32768) >> 16);
|
||||||
|
|
||||||
if (dPtr >= ePtr) break;
|
if (dPtr >= ePtr) break;
|
||||||
*(dPtr++) = XMVectorSet(float(std::min<int>(std::max<int>(r, 0), 1023)) / 1023.f,
|
*(dPtr++) = XMVectorSet(float(std::min<int>(std::max<int>(r, 0), 1023)) / 1023.f,
|
||||||
@ -1367,7 +1361,7 @@ _Use_decl_annotations_ bool DirectX::Internal::LoadScanline(
|
|||||||
const int64_t u = int64_t(sPtr->x) - 32768;
|
const int64_t u = int64_t(sPtr->x) - 32768;
|
||||||
const int64_t y = int64_t(sPtr->y) - 4096;
|
const int64_t y = int64_t(sPtr->y) - 4096;
|
||||||
const int64_t v = int64_t(sPtr->z) - 32768;
|
const int64_t v = int64_t(sPtr->z) - 32768;
|
||||||
const auto a = static_cast<int>(sPtr->w);
|
auto const a = static_cast<int>(sPtr->w);
|
||||||
++sPtr;
|
++sPtr;
|
||||||
|
|
||||||
// http://msdn.microsoft.com/en-us/library/windows/desktop/bb970578.aspx
|
// http://msdn.microsoft.com/en-us/library/windows/desktop/bb970578.aspx
|
||||||
@ -1380,9 +1374,9 @@ _Use_decl_annotations_ bool DirectX::Internal::LoadScanline(
|
|||||||
// G = 1.1689Y' - 0.3933Cb' - 0.8160Cr'
|
// G = 1.1689Y' - 0.3933Cb' - 0.8160Cr'
|
||||||
// B = 1.1689Y'+ 2.0251Cb'
|
// B = 1.1689Y'+ 2.0251Cb'
|
||||||
|
|
||||||
const auto r = static_cast<int>((76607 * y + 105006 * v + 32768) >> 16);
|
auto const r = static_cast<int>((76607 * y + 105006 * v + 32768) >> 16);
|
||||||
const auto g = static_cast<int>((76607 * y - 25772 * u - 53477 * v + 32768) >> 16);
|
auto const g = static_cast<int>((76607 * y - 25772 * u - 53477 * v + 32768) >> 16);
|
||||||
const auto b = static_cast<int>((76607 * y + 132718 * u + 32768) >> 16);
|
auto const b = static_cast<int>((76607 * y + 132718 * u + 32768) >> 16);
|
||||||
|
|
||||||
if (dPtr >= ePtr) break;
|
if (dPtr >= ePtr) break;
|
||||||
*(dPtr++) = XMVectorSet(float(std::min<int>(std::max<int>(r, 0), 65535)) / 65535.f,
|
*(dPtr++) = XMVectorSet(float(std::min<int>(std::max<int>(r, 0), 65535)) / 65535.f,
|
||||||
@ -4716,7 +4710,7 @@ namespace
|
|||||||
filter &= ~(TEX_FILTER_SRGB_IN | TEX_FILTER_SRGB_OUT);
|
filter &= ~(TEX_FILTER_SRGB_IN | TEX_FILTER_SRGB_OUT);
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto wicsrgb = CheckWICColorSpace(pfGUID, targetGUID);
|
auto const wicsrgb = CheckWICColorSpace(pfGUID, targetGUID);
|
||||||
|
|
||||||
if (wicsrgb != (filter & (TEX_FILTER_SRGB_IN | TEX_FILTER_SRGB_OUT)))
|
if (wicsrgb != (filter & (TEX_FILTER_SRGB_IN | TEX_FILTER_SRGB_OUT)))
|
||||||
{
|
{
|
||||||
@ -4804,8 +4798,7 @@ namespace
|
|||||||
_In_ TEX_FILTER_FLAGS filter,
|
_In_ TEX_FILTER_FLAGS filter,
|
||||||
_In_ const Image& destImage,
|
_In_ const Image& destImage,
|
||||||
_In_ float threshold,
|
_In_ float threshold,
|
||||||
size_t z,
|
size_t z) noexcept
|
||||||
const std::function<bool __cdecl(size_t, size_t)>& statusCallback) noexcept
|
|
||||||
{
|
{
|
||||||
assert(srcImage.width == destImage.width);
|
assert(srcImage.width == destImage.width);
|
||||||
assert(srcImage.height == destImage.height);
|
assert(srcImage.height == destImage.height);
|
||||||
@ -4829,14 +4822,6 @@ namespace
|
|||||||
|
|
||||||
for (size_t h = 0; h < srcImage.height; ++h)
|
for (size_t h = 0; h < srcImage.height; ++h)
|
||||||
{
|
{
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(h, srcImage.height))
|
|
||||||
{
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!LoadScanline(scanline.get(), width, pSrc, srcImage.rowPitch, srcImage.format))
|
if (!LoadScanline(scanline.get(), width, pSrc, srcImage.rowPitch, srcImage.format))
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
||||||
@ -4860,14 +4845,6 @@ namespace
|
|||||||
// Ordered dithering
|
// Ordered dithering
|
||||||
for (size_t h = 0; h < srcImage.height; ++h)
|
for (size_t h = 0; h < srcImage.height; ++h)
|
||||||
{
|
{
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(h, srcImage.height))
|
|
||||||
{
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!LoadScanline(scanline.get(), width, pSrc, srcImage.rowPitch, srcImage.format))
|
if (!LoadScanline(scanline.get(), width, pSrc, srcImage.rowPitch, srcImage.format))
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
||||||
@ -4885,14 +4862,6 @@ namespace
|
|||||||
// No dithering
|
// No dithering
|
||||||
for (size_t h = 0; h < srcImage.height; ++h)
|
for (size_t h = 0; h < srcImage.height; ++h)
|
||||||
{
|
{
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(h, srcImage.height))
|
|
||||||
{
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!LoadScanline(scanline.get(), width, pSrc, srcImage.rowPitch, srcImage.format))
|
if (!LoadScanline(scanline.get(), width, pSrc, srcImage.rowPitch, srcImage.format))
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
||||||
@ -4943,7 +4912,7 @@ namespace
|
|||||||
{\
|
{\
|
||||||
const size_t rowPitch = srcImage.rowPitch;\
|
const size_t rowPitch = srcImage.rowPitch;\
|
||||||
\
|
\
|
||||||
const auto sourceE = reinterpret_cast<const srcType*>(pSrc + srcImage.slicePitch);\
|
auto const sourceE = reinterpret_cast<const srcType*>(pSrc + srcImage.slicePitch);\
|
||||||
auto pSrcUV = pSrc + (srcImage.height * rowPitch);\
|
auto pSrcUV = pSrc + (srcImage.height * rowPitch);\
|
||||||
\
|
\
|
||||||
for(size_t y = 0; y < srcImage.height; y+= 2)\
|
for(size_t y = 0; y < srcImage.height; y+= 2)\
|
||||||
@ -5092,21 +5061,6 @@ HRESULT DirectX::Convert(
|
|||||||
TEX_FILTER_FLAGS filter,
|
TEX_FILTER_FLAGS filter,
|
||||||
float threshold,
|
float threshold,
|
||||||
ScratchImage& image) noexcept
|
ScratchImage& image) noexcept
|
||||||
{
|
|
||||||
ConvertOptions options = {};
|
|
||||||
options.filter = filter;
|
|
||||||
options.threshold = threshold;
|
|
||||||
|
|
||||||
return ConvertEx(srcImage, format, options, image, nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT DirectX::ConvertEx(
|
|
||||||
const Image& srcImage,
|
|
||||||
DXGI_FORMAT format,
|
|
||||||
const ConvertOptions& options,
|
|
||||||
ScratchImage& image,
|
|
||||||
std::function<bool __cdecl(size_t, size_t)> statusCallback)
|
|
||||||
{
|
{
|
||||||
if ((srcImage.format == format) || !IsValid(format))
|
if ((srcImage.format == format) || !IsValid(format))
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
@ -5134,23 +5088,14 @@ HRESULT DirectX::ConvertEx(
|
|||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(0, rimage->height))
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
WICPixelFormatGUID pfGUID, targetGUID;
|
WICPixelFormatGUID pfGUID, targetGUID;
|
||||||
if (UseWICConversion(options.filter, srcImage.format, format, pfGUID, targetGUID))
|
if (UseWICConversion(filter, srcImage.format, format, pfGUID, targetGUID))
|
||||||
{
|
{
|
||||||
hr = ConvertUsingWIC(srcImage, pfGUID, targetGUID, options.filter, options.threshold, *rimage);
|
hr = ConvertUsingWIC(srcImage, pfGUID, targetGUID, filter, threshold, *rimage);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
hr = ConvertCustom(srcImage, options.filter, *rimage, options.threshold, 0, statusCallback);
|
hr = ConvertCustom(srcImage, filter, *rimage, threshold, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
@ -5159,15 +5104,6 @@ HRESULT DirectX::ConvertEx(
|
|||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(rimage->height, rimage->height))
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -5184,23 +5120,6 @@ HRESULT DirectX::Convert(
|
|||||||
TEX_FILTER_FLAGS filter,
|
TEX_FILTER_FLAGS filter,
|
||||||
float threshold,
|
float threshold,
|
||||||
ScratchImage& result) noexcept
|
ScratchImage& result) noexcept
|
||||||
{
|
|
||||||
ConvertOptions options = {};
|
|
||||||
options.filter = filter;
|
|
||||||
options.threshold = threshold;
|
|
||||||
|
|
||||||
return ConvertEx(srcImages, nimages, metadata, format, options, result, nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT DirectX::ConvertEx(
|
|
||||||
const Image* srcImages,
|
|
||||||
size_t nimages,
|
|
||||||
const TexMetadata& metadata,
|
|
||||||
DXGI_FORMAT format,
|
|
||||||
const ConvertOptions& options,
|
|
||||||
ScratchImage& result,
|
|
||||||
std::function<bool __cdecl(size_t, size_t)> statusCallback)
|
|
||||||
{
|
{
|
||||||
if (!srcImages || !nimages || (metadata.format == format) || !IsValid(format))
|
if (!srcImages || !nimages || (metadata.format == format) || !IsValid(format))
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
@ -5214,19 +5133,6 @@ HRESULT DirectX::ConvertEx(
|
|||||||
if ((metadata.width > UINT32_MAX) || (metadata.height > UINT32_MAX))
|
if ((metadata.width > UINT32_MAX) || (metadata.height > UINT32_MAX))
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
if (statusCallback
|
|
||||||
&& nimages == 1
|
|
||||||
&& !metadata.IsVolumemap()
|
|
||||||
&& metadata.mipLevels == 1
|
|
||||||
&& metadata.arraySize == 1)
|
|
||||||
{
|
|
||||||
// If progress reporting is requested when converting a single 1D or 2D image, call
|
|
||||||
// the ConvertEx overload that takes a single image.
|
|
||||||
// This provides a better user experience as progress will be reported as the image
|
|
||||||
// is being processed, instead of after processing has been completed.
|
|
||||||
return ConvertEx(srcImages[0], format, options, result, statusCallback);
|
|
||||||
}
|
|
||||||
|
|
||||||
TexMetadata mdata2 = metadata;
|
TexMetadata mdata2 = metadata;
|
||||||
mdata2.format = format;
|
mdata2.format = format;
|
||||||
HRESULT hr = result.Initialize(mdata2);
|
HRESULT hr = result.Initialize(mdata2);
|
||||||
@ -5246,17 +5152,8 @@ HRESULT DirectX::ConvertEx(
|
|||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(0, nimages))
|
|
||||||
{
|
|
||||||
result.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
WICPixelFormatGUID pfGUID, targetGUID;
|
WICPixelFormatGUID pfGUID, targetGUID;
|
||||||
const bool usewic = !metadata.IsPMAlpha() && UseWICConversion(options.filter, metadata.format, format, pfGUID, targetGUID);
|
const bool usewic = !metadata.IsPMAlpha() && UseWICConversion(filter, metadata.format, format, pfGUID, targetGUID);
|
||||||
|
|
||||||
switch (metadata.dimension)
|
switch (metadata.dimension)
|
||||||
{
|
{
|
||||||
@ -5288,11 +5185,11 @@ HRESULT DirectX::ConvertEx(
|
|||||||
|
|
||||||
if (usewic)
|
if (usewic)
|
||||||
{
|
{
|
||||||
hr = ConvertUsingWIC(src, pfGUID, targetGUID, options.filter, options.threshold, dst);
|
hr = ConvertUsingWIC(src, pfGUID, targetGUID, filter, threshold, dst);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
hr = ConvertCustom(src, options.filter, dst, options.threshold, 0, nullptr);
|
hr = ConvertCustom(src, filter, dst, threshold, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
@ -5300,15 +5197,6 @@ HRESULT DirectX::ConvertEx(
|
|||||||
result.Release();
|
result.Release();
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(index, nimages))
|
|
||||||
{
|
|
||||||
result.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -5350,11 +5238,11 @@ HRESULT DirectX::ConvertEx(
|
|||||||
|
|
||||||
if (usewic)
|
if (usewic)
|
||||||
{
|
{
|
||||||
hr = ConvertUsingWIC(src, pfGUID, targetGUID, options.filter, options.threshold, dst);
|
hr = ConvertUsingWIC(src, pfGUID, targetGUID, filter, threshold, dst);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
hr = ConvertCustom(src, options.filter, dst, options.threshold, slice, nullptr);
|
hr = ConvertCustom(src, filter, dst, threshold, slice);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
@ -5362,15 +5250,6 @@ HRESULT DirectX::ConvertEx(
|
|||||||
result.Release();
|
result.Release();
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(index, nimages))
|
|
||||||
{
|
|
||||||
result.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (d > 1)
|
if (d > 1)
|
||||||
@ -5384,15 +5263,6 @@ HRESULT DirectX::ConvertEx(
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusCallback)
|
|
||||||
{
|
|
||||||
if (!statusCallback(nimages, nimages))
|
|
||||||
{
|
|
||||||
result.Release();
|
|
||||||
return E_ABORT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -222,7 +222,7 @@ bool DirectX::IsSupportedTexture(
|
|||||||
const size_t iWidth = metadata.width;
|
const size_t iWidth = metadata.width;
|
||||||
const size_t iHeight = metadata.height;
|
const size_t iHeight = metadata.height;
|
||||||
|
|
||||||
switch (static_cast<int>(fmt))
|
switch (fmt)
|
||||||
{
|
{
|
||||||
case DXGI_FORMAT_BC4_TYPELESS:
|
case DXGI_FORMAT_BC4_TYPELESS:
|
||||||
case DXGI_FORMAT_BC4_UNORM:
|
case DXGI_FORMAT_BC4_UNORM:
|
||||||
@ -653,9 +653,6 @@ HRESULT DirectX::CreateTextureEx(
|
|||||||
hr = pDevice->CreateTexture3D(&desc, initData.get(), reinterpret_cast<ID3D11Texture3D**>(ppResource));
|
hr = pDevice->CreateTexture3D(&desc, initData.get(), reinterpret_cast<ID3D11Texture3D**>(ppResource));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
return HRESULT_E_NOT_SUPPORTED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return hr;
|
return hr;
|
||||||
|
|||||||
@ -88,9 +88,6 @@ namespace
|
|||||||
res.SlicePitch = res.RowPitch * static_cast<PT>(height);
|
res.SlicePitch = res.RowPitch * static_cast<PT>(height);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -124,19 +121,14 @@ namespace
|
|||||||
_In_ ID3D12CommandQueue* pCommandQ,
|
_In_ ID3D12CommandQueue* pCommandQ,
|
||||||
_In_ ID3D12Resource* pSource,
|
_In_ ID3D12Resource* pSource,
|
||||||
const D3D12_RESOURCE_DESC& desc,
|
const D3D12_RESOURCE_DESC& desc,
|
||||||
_COM_Outptr_ ID3D12Resource** pStaging,
|
ComPtr<ID3D12Resource>& pStaging,
|
||||||
std::unique_ptr<uint8_t[]>& layoutBuff,
|
std::unique_ptr<uint8_t[]>& layoutBuff,
|
||||||
UINT& numberOfPlanes,
|
UINT& numberOfPlanes,
|
||||||
UINT& numberOfResources,
|
UINT& numberOfResources,
|
||||||
D3D12_RESOURCE_STATES beforeState,
|
D3D12_RESOURCE_STATES beforeState,
|
||||||
D3D12_RESOURCE_STATES afterState) noexcept
|
D3D12_RESOURCE_STATES afterState) noexcept
|
||||||
{
|
{
|
||||||
if (pStaging)
|
if (!pCommandQ || !pSource)
|
||||||
{
|
|
||||||
*pStaging = nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!pCommandQ || !pSource || !pStaging)
|
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
numberOfPlanes = D3D12GetFormatPlaneCount(device, desc.Format);
|
numberOfPlanes = D3D12GetFormatPlaneCount(device, desc.Format);
|
||||||
@ -178,8 +170,7 @@ namespace
|
|||||||
if (SUCCEEDED(hr) && sourceHeapProperties.Type == D3D12_HEAP_TYPE_READBACK)
|
if (SUCCEEDED(hr) && sourceHeapProperties.Type == D3D12_HEAP_TYPE_READBACK)
|
||||||
{
|
{
|
||||||
// Handle case where the source is already a staging texture we can use directly
|
// Handle case where the source is already a staging texture we can use directly
|
||||||
*pStaging = pSource;
|
pStaging = pSource;
|
||||||
pSource->AddRef();
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -217,11 +208,8 @@ namespace
|
|||||||
bufferDesc.SampleDesc.Count = 1;
|
bufferDesc.SampleDesc.Count = 1;
|
||||||
|
|
||||||
ComPtr<ID3D12Resource> copySource(pSource);
|
ComPtr<ID3D12Resource> copySource(pSource);
|
||||||
D3D12_RESOURCE_STATES beforeStateSource = beforeState;
|
|
||||||
if (desc.SampleDesc.Count > 1)
|
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
|
// MSAA content must be resolved before being copied to a staging texture
|
||||||
auto descCopy = desc;
|
auto descCopy = desc;
|
||||||
descCopy.SampleDesc.Count = 1;
|
descCopy.SampleDesc.Count = 1;
|
||||||
@ -233,7 +221,7 @@ namespace
|
|||||||
&defaultHeapProperties,
|
&defaultHeapProperties,
|
||||||
D3D12_HEAP_FLAG_NONE,
|
D3D12_HEAP_FLAG_NONE,
|
||||||
&descCopy,
|
&descCopy,
|
||||||
D3D12_RESOURCE_STATE_RESOLVE_DEST,
|
D3D12_RESOURCE_STATE_COPY_DEST,
|
||||||
nullptr,
|
nullptr,
|
||||||
IID_GRAPHICS_PPV_ARGS(pTemp.GetAddressOf()));
|
IID_GRAPHICS_PPV_ARGS(pTemp.GetAddressOf()));
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
@ -270,11 +258,6 @@ namespace
|
|||||||
}
|
}
|
||||||
|
|
||||||
copySource = pTemp;
|
copySource = pTemp;
|
||||||
beforeState = D3D12_RESOURCE_STATE_RESOLVE_DEST;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
beforeStateSource = D3D12_RESOURCE_STATE_COPY_SOURCE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a staging texture
|
// Create a staging texture
|
||||||
@ -284,25 +267,25 @@ namespace
|
|||||||
&bufferDesc,
|
&bufferDesc,
|
||||||
D3D12_RESOURCE_STATE_COPY_DEST,
|
D3D12_RESOURCE_STATE_COPY_DEST,
|
||||||
nullptr,
|
nullptr,
|
||||||
IID_GRAPHICS_PPV_ARGS(pStaging));
|
IID_GRAPHICS_PPV_ARGS(pStaging.GetAddressOf()));
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
assert(*pStaging);
|
assert(pStaging);
|
||||||
|
|
||||||
// Transition the resource if necessary
|
// Transition the resource if necessary
|
||||||
TransitionResource(commandList.Get(), copySource.Get(), beforeState, D3D12_RESOURCE_STATE_COPY_SOURCE);
|
TransitionResource(commandList.Get(), pSource, beforeState, D3D12_RESOURCE_STATE_COPY_SOURCE);
|
||||||
|
|
||||||
// Get the copy target location
|
// Get the copy target location
|
||||||
for (UINT j = 0; j < numberOfResources; ++j)
|
for (UINT j = 0; j < numberOfResources; ++j)
|
||||||
{
|
{
|
||||||
const CD3DX12_TEXTURE_COPY_LOCATION copyDest(*pStaging, pLayout[j]);
|
const CD3DX12_TEXTURE_COPY_LOCATION copyDest(pStaging.Get(), pLayout[j]);
|
||||||
const CD3DX12_TEXTURE_COPY_LOCATION copySrc(copySource.Get(), j);
|
const CD3DX12_TEXTURE_COPY_LOCATION copySrc(copySource.Get(), j);
|
||||||
commandList->CopyTextureRegion(©Dest, 0, 0, 0, ©Src, nullptr);
|
commandList->CopyTextureRegion(©Dest, 0, 0, 0, ©Src, nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Transition the source resource to the next state
|
// Transition the resource to the next state
|
||||||
TransitionResource(commandList.Get(), pSource, beforeStateSource, afterState);
|
TransitionResource(commandList.Get(), pSource, D3D12_RESOURCE_STATE_COPY_SOURCE, afterState);
|
||||||
|
|
||||||
hr = commandList->Close();
|
hr = commandList->Close();
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
@ -355,7 +338,7 @@ bool DirectX::IsSupportedTexture(
|
|||||||
const size_t iWidth = metadata.width;
|
const size_t iWidth = metadata.width;
|
||||||
const size_t iHeight = metadata.height;
|
const size_t iHeight = metadata.height;
|
||||||
|
|
||||||
switch (static_cast<int>(fmt))
|
switch (fmt)
|
||||||
{
|
{
|
||||||
case DXGI_FORMAT_NV12:
|
case DXGI_FORMAT_NV12:
|
||||||
case DXGI_FORMAT_P010:
|
case DXGI_FORMAT_P010:
|
||||||
@ -738,10 +721,10 @@ HRESULT DirectX::CaptureTexture(
|
|||||||
pCommandQueue->GetDevice(IID_GRAPHICS_PPV_ARGS(device.GetAddressOf()));
|
pCommandQueue->GetDevice(IID_GRAPHICS_PPV_ARGS(device.GetAddressOf()));
|
||||||
|
|
||||||
#if defined(_MSC_VER) || !defined(_WIN32)
|
#if defined(_MSC_VER) || !defined(_WIN32)
|
||||||
const auto desc = pSource->GetDesc();
|
auto const desc = pSource->GetDesc();
|
||||||
#else
|
#else
|
||||||
D3D12_RESOURCE_DESC tmpDesc;
|
D3D12_RESOURCE_DESC tmpDesc;
|
||||||
const auto& desc = *pSource->GetDesc(&tmpDesc);
|
auto const& desc = *pSource->GetDesc(&tmpDesc);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ComPtr<ID3D12Resource> pStaging;
|
ComPtr<ID3D12Resource> pStaging;
|
||||||
@ -751,7 +734,7 @@ HRESULT DirectX::CaptureTexture(
|
|||||||
pCommandQueue,
|
pCommandQueue,
|
||||||
pSource,
|
pSource,
|
||||||
desc,
|
desc,
|
||||||
pStaging.GetAddressOf(),
|
pStaging,
|
||||||
layoutBuff,
|
layoutBuff,
|
||||||
numberOfPlanes,
|
numberOfPlanes,
|
||||||
numberOfResources,
|
numberOfResources,
|
||||||
@ -829,7 +812,7 @@ HRESULT DirectX::CaptureTexture(
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
BYTE* pData = nullptr;
|
BYTE* pData;
|
||||||
hr = pStaging->Map(0, nullptr, reinterpret_cast<void**>(&pData));
|
hr = pStaging->Map(0, nullptr, reinterpret_cast<void**>(&pData));
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
|
|||||||
@ -22,6 +22,8 @@ static_assert(static_cast<int>(TEX_DIMENSION_TEXTURE3D) == static_cast<int>(DDS_
|
|||||||
|
|
||||||
namespace
|
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)
|
// Legacy format mapping table (used for DDS files without 'DX10' extended header)
|
||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
@ -46,9 +48,6 @@ namespace
|
|||||||
CONV_FLAGS_L8 = 0x40000, // Source is a 8 luminance format
|
CONV_FLAGS_L8 = 0x40000, // Source is a 8 luminance format
|
||||||
CONV_FLAGS_L16 = 0x80000, // Source is a 16 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_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
|
struct LegacyDDS
|
||||||
@ -105,18 +104,19 @@ namespace
|
|||||||
{ DXGI_FORMAT_R10G10B10A2_UNORM, CONV_FLAGS_SWIZZLE, DDSPF_A2R10G10B10 }, // D3DFMT_A2R10G10B10 (D3DX reversal issue)
|
{ 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_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,
|
{ DXGI_FORMAT_R8G8B8A8_UNORM, CONV_FLAGS_EXPAND
|
||||||
DDSPF_R8G8B8 }, // D3DFMT_R8G8B8
|
| CONV_FLAGS_NOALPHA
|
||||||
|
| CONV_FLAGS_888, DDSPF_R8G8B8 }, // D3DFMT_R8G8B8
|
||||||
|
|
||||||
{ DXGI_FORMAT_B5G6R5_UNORM, CONV_FLAGS_565, DDSPF_R5G6B5 }, // D3DFMT_R5G6B5
|
{ 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, DDSPF_A1R5G5B5 }, // D3DFMT_A1R5G5B5
|
||||||
{ DXGI_FORMAT_B5G5R5A1_UNORM, CONV_FLAGS_5551 | CONV_FLAGS_NOALPHA,
|
{ DXGI_FORMAT_B5G5R5A1_UNORM, CONV_FLAGS_5551
|
||||||
DDSPF_X1R5G5B5 }, // D3DFMT_X1R5G5B5
|
| CONV_FLAGS_NOALPHA, DDSPF_X1R5G5B5 }, // D3DFMT_X1R5G5B5
|
||||||
|
|
||||||
{ DXGI_FORMAT_R8G8B8A8_UNORM, CONV_FLAGS_EXPAND | CONV_FLAGS_8332,
|
{ DXGI_FORMAT_R8G8B8A8_UNORM, CONV_FLAGS_EXPAND
|
||||||
DDSPF_A8R3G3B2 }, // D3DFMT_A8R3G3B2
|
| CONV_FLAGS_8332, DDSPF_A8R3G3B2 }, // D3DFMT_A8R3G3B2
|
||||||
{ DXGI_FORMAT_B5G6R5_UNORM, CONV_FLAGS_EXPAND | CONV_FLAGS_332,
|
{ DXGI_FORMAT_B5G6R5_UNORM, CONV_FLAGS_EXPAND
|
||||||
DDSPF_R3G3B2 }, // D3DFMT_R3G3B2
|
| CONV_FLAGS_332, DDSPF_R3G3B2 }, // D3DFMT_R3G3B2
|
||||||
|
|
||||||
{ DXGI_FORMAT_R8_UNORM, CONV_FLAGS_NONE, DDSPF_L8 }, // D3DFMT_L8
|
{ DXGI_FORMAT_R8_UNORM, CONV_FLAGS_NONE, DDSPF_L8 }, // D3DFMT_L8
|
||||||
{ DXGI_FORMAT_R16_UNORM, CONV_FLAGS_NONE, DDSPF_L16 }, // D3DFMT_L16
|
{ DXGI_FORMAT_R16_UNORM, CONV_FLAGS_NONE, DDSPF_L16 }, // D3DFMT_L16
|
||||||
@ -141,16 +141,17 @@ 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_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,
|
{ DXGI_FORMAT_R8G8B8A8_UNORM, CONV_FLAGS_EXPAND
|
||||||
{ sizeof(DDS_PIXELFORMAT), DDS_PAL8A, 0, 16, 0, 0, 0, 0xff00 } }, // D3DFMT_A8P8
|
| CONV_FLAGS_PAL8
|
||||||
{ 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
|
||||||
{ sizeof(DDS_PIXELFORMAT), DDS_PAL8, 0, 8, 0, 0, 0, 0 } }, // D3DFMT_P8
|
{ 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_4444, DDSPF_A4R4G4B4 }, // D3DFMT_A4R4G4B4 (uses DXGI 1.2 format)
|
||||||
{ DXGI_FORMAT_B4G4R4A4_UNORM, CONV_FLAGS_NOALPHA | CONV_FLAGS_4444,
|
{ DXGI_FORMAT_B4G4R4A4_UNORM, CONV_FLAGS_NOALPHA
|
||||||
DDSPF_X4R4G4B4 }, // D3DFMT_X4R4G4B4 (uses DXGI 1.2 format)
|
| CONV_FLAGS_4444, DDSPF_X4R4G4B4 }, // D3DFMT_X4R4G4B4 (uses DXGI 1.2 format)
|
||||||
{ DXGI_FORMAT_B4G4R4A4_UNORM, CONV_FLAGS_EXPAND | CONV_FLAGS_44,
|
{ DXGI_FORMAT_B4G4R4A4_UNORM, CONV_FLAGS_EXPAND
|
||||||
DDSPF_A4L4 }, // D3DFMT_A4L4 (uses DXGI 1.2 format)
|
| 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_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)
|
{ DXGI_FORMAT_YUY2, CONV_FLAGS_SWIZZLE, DDSPF_UYVY }, // D3DFMT_UYVY (uses DXGI 1.2 format)
|
||||||
@ -158,11 +159,6 @@ namespace
|
|||||||
{ DXGI_FORMAT_R8G8_SNORM, CONV_FLAGS_NONE, DDSPF_V8U8 }, // D3DFMT_V8U8
|
{ DXGI_FORMAT_R8G8_SNORM, CONV_FLAGS_NONE, DDSPF_V8U8 }, // D3DFMT_V8U8
|
||||||
{ DXGI_FORMAT_R8G8B8A8_SNORM, CONV_FLAGS_NONE, DDSPF_Q8W8V8U8 }, // D3DFMT_Q8W8V8U8
|
{ DXGI_FORMAT_R8G8B8A8_SNORM, CONV_FLAGS_NONE, DDSPF_Q8W8V8U8 }, // D3DFMT_Q8W8V8U8
|
||||||
{ DXGI_FORMAT_R16G16_SNORM, CONV_FLAGS_NONE, DDSPF_V16U16 }, // D3DFMT_V16U16
|
{ 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
|
// Note that many common DDS reader/writers (including D3DX) swap the
|
||||||
@ -172,14 +168,15 @@ namespace
|
|||||||
// header extension and specify the DXGI_FORMAT_R10G10B10A2_UNORM format directly
|
// header extension and specify the DXGI_FORMAT_R10G10B10A2_UNORM format directly
|
||||||
|
|
||||||
// We do not support the following legacy Direct3D 9 formats:
|
// We do not support the following legacy Direct3D 9 formats:
|
||||||
// D3DFMT_D16_LOCKABLE (DDPF_ZBUFFER: 0x00000400)
|
// BumpDuDv D3DFMT_A2W10V10U10
|
||||||
// FourCC 82 D3DFMT_D32F_LOCKABLE
|
// BumpLuminance D3DFMT_L6V5U5, D3DFMT_X8L8V8U8
|
||||||
// FourCC 117 D3DFMT_CxV8U8
|
// FourCC 117 D3DFMT_CxV8U8
|
||||||
|
// ZBuffer D3DFMT_D16_LOCKABLE
|
||||||
|
// FourCC 82 D3DFMT_D32F_LOCKABLE
|
||||||
|
|
||||||
// We do not support the following known FourCC codes:
|
// We do not support the following known FourCC codes:
|
||||||
// FourCC CTX1 (Xbox 360 only)
|
// FourCC CTX1 (Xbox 360 only)
|
||||||
// FourCC EAR, EARG, ET2, ET2A (Ericsson Texture Compression)
|
// 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,
|
DXGI_FORMAT GetDXGIFormat(const DDS_HEADER& hdr, const DDS_PIXELFORMAT& ddpf,
|
||||||
DDS_FLAGS flags,
|
DDS_FLAGS flags,
|
||||||
@ -194,22 +191,6 @@ namespace
|
|||||||
|
|
||||||
constexpr size_t MAP_SIZE = sizeof(g_LegacyDDSMap) / sizeof(LegacyDDS);
|
constexpr size_t MAP_SIZE = sizeof(g_LegacyDDSMap) / sizeof(LegacyDDS);
|
||||||
size_t index = 0;
|
size_t index = 0;
|
||||||
if (ddpf.size == 0 && ddpf.flags == 0 && ddpf.fourCC != 0)
|
|
||||||
{
|
|
||||||
// Handle some DDS files where the DDPF_PIXELFORMAT is mostly zero
|
|
||||||
for (index = 0; index < MAP_SIZE; ++index)
|
|
||||||
{
|
|
||||||
const LegacyDDS* entry = &g_LegacyDDSMap[index];
|
|
||||||
|
|
||||||
if (entry->ddpf.flags & DDS_FOURCC)
|
|
||||||
{
|
|
||||||
if (ddpf.fourCC == entry->ddpf.fourCC)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
for (index = 0; index < MAP_SIZE; ++index)
|
for (index = 0; index < MAP_SIZE; ++index)
|
||||||
{
|
{
|
||||||
const LegacyDDS* entry = &g_LegacyDDSMap[index];
|
const LegacyDDS* entry = &g_LegacyDDSMap[index];
|
||||||
@ -220,16 +201,17 @@ namespace
|
|||||||
if (ddpf.fourCC == entry->ddpf.fourCC)
|
if (ddpf.fourCC == entry->ddpf.fourCC)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if ((ddpfFlags == entry->ddpf.flags) && (ddpf.RGBBitCount == entry->ddpf.RGBBitCount))
|
else if (ddpfFlags == entry->ddpf.flags)
|
||||||
{
|
{
|
||||||
if (entry->ddpf.flags & DDS_PAL8)
|
if (entry->ddpf.flags & DDS_PAL8)
|
||||||
{
|
{
|
||||||
// PAL8 / PAL8A
|
if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (entry->ddpf.flags & DDS_ALPHA)
|
else if (entry->ddpf.flags & DDS_ALPHA)
|
||||||
{
|
{
|
||||||
if (ddpf.ABitMask == entry->ddpf.ABitMask)
|
if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount
|
||||||
|
&& ddpf.ABitMask == entry->ddpf.ABitMask)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (entry->ddpf.flags & DDS_LUMINANCE)
|
else if (entry->ddpf.flags & DDS_LUMINANCE)
|
||||||
@ -237,37 +219,31 @@ namespace
|
|||||||
if (entry->ddpf.flags & DDS_ALPHAPIXELS)
|
if (entry->ddpf.flags & DDS_ALPHAPIXELS)
|
||||||
{
|
{
|
||||||
// LUMINANCEA
|
// LUMINANCEA
|
||||||
if (ddpf.RBitMask == entry->ddpf.RBitMask
|
if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount
|
||||||
|
&& ddpf.RBitMask == entry->ddpf.RBitMask
|
||||||
&& ddpf.ABitMask == entry->ddpf.ABitMask)
|
&& ddpf.ABitMask == entry->ddpf.ABitMask)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// LUMINANCE
|
// LUMINANCE
|
||||||
if (ddpf.RBitMask == entry->ddpf.RBitMask)
|
if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount
|
||||||
|
&& ddpf.RBitMask == entry->ddpf.RBitMask)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (entry->ddpf.flags & DDS_BUMPDUDV)
|
else if (entry->ddpf.flags & DDS_BUMPDUDV)
|
||||||
{
|
{
|
||||||
if (entry->ddpf.flags & DDS_ALPHAPIXELS)
|
if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount
|
||||||
{
|
&& ddpf.RBitMask == entry->ddpf.RBitMask
|
||||||
// BUMPDUDVA
|
&& ddpf.GBitMask == entry->ddpf.GBitMask
|
||||||
if (ddpf.RBitMask == entry->ddpf.RBitMask
|
&& ddpf.BBitMask == entry->ddpf.BBitMask
|
||||||
&& ddpf.ABitMask == entry->ddpf.ABitMask)
|
&& ddpf.ABitMask == entry->ddpf.ABitMask)
|
||||||
{
|
|
||||||
flags &= ~DDS_FLAGS_NO_R10B10G10A2_FIXUP;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
else if (ddpf.RGBBitCount == entry->ddpf.RGBBitCount)
|
||||||
else
|
|
||||||
{
|
{
|
||||||
// BUMPDUDV
|
if (entry->ddpf.flags & DDS_ALPHAPIXELS)
|
||||||
if (ddpf.RBitMask == entry->ddpf.RBitMask)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (entry->ddpf.flags & DDS_ALPHAPIXELS)
|
|
||||||
{
|
{
|
||||||
// RGBA
|
// RGBA
|
||||||
if (ddpf.RBitMask == entry->ddpf.RBitMask
|
if (ddpf.RBitMask == entry->ddpf.RBitMask
|
||||||
@ -313,6 +289,7 @@ namespace
|
|||||||
return format;
|
return format;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
// Decodes DDS header including optional DX10 extended header
|
// Decodes DDS header including optional DX10 extended header
|
||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
@ -321,25 +298,20 @@ namespace
|
|||||||
size_t size,
|
size_t size,
|
||||||
DDS_FLAGS flags,
|
DDS_FLAGS flags,
|
||||||
_Out_ TexMetadata& metadata,
|
_Out_ TexMetadata& metadata,
|
||||||
_Out_opt_ DDSMetaData* ddPixelFormat,
|
|
||||||
_Inout_ uint32_t& convFlags) noexcept
|
_Inout_ uint32_t& convFlags) noexcept
|
||||||
{
|
{
|
||||||
if (!pSource)
|
if (!pSource)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
metadata = {};
|
memset(&metadata, 0, sizeof(TexMetadata));
|
||||||
if (ddPixelFormat)
|
|
||||||
{
|
|
||||||
*ddPixelFormat = {};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (size < DDS_MIN_HEADER_SIZE)
|
if (size < (sizeof(DDS_HEADER) + sizeof(uint32_t)))
|
||||||
{
|
{
|
||||||
return HRESULT_E_INVALID_DATA;
|
return HRESULT_E_INVALID_DATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
// DDS files always start with the same magic number ("DDS ")
|
// DDS files always start with the same magic number ("DDS ")
|
||||||
const auto dwMagicNumber = *static_cast<const uint32_t*>(pSource);
|
auto const dwMagicNumber = *static_cast<const uint32_t*>(pSource);
|
||||||
if (dwMagicNumber != DDS_MAGIC)
|
if (dwMagicNumber != DDS_MAGIC)
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
@ -348,63 +320,33 @@ namespace
|
|||||||
auto pHeader = reinterpret_cast<const DDS_HEADER*>(static_cast<const uint8_t*>(pSource) + sizeof(uint32_t));
|
auto pHeader = reinterpret_cast<const DDS_HEADER*>(static_cast<const uint8_t*>(pSource) + sizeof(uint32_t));
|
||||||
|
|
||||||
// Verify header to validate DDS file
|
// Verify header to validate DDS file
|
||||||
if (flags & DDS_FLAGS_PERMISSIVE)
|
if (pHeader->size != sizeof(DDS_HEADER)
|
||||||
|
|| pHeader->ddspf.size != sizeof(DDS_PIXELFORMAT))
|
||||||
{
|
{
|
||||||
if (pHeader->size != 24 /* Known variant */
|
return E_FAIL;
|
||||||
&& pHeader->size != sizeof(DDS_HEADER))
|
|
||||||
{
|
|
||||||
return HRESULT_E_NOT_SUPPORTED;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (pHeader->size != sizeof(DDS_HEADER))
|
|
||||||
{
|
|
||||||
return HRESULT_E_NOT_SUPPORTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flags & DDS_FLAGS_PERMISSIVE)
|
|
||||||
{
|
|
||||||
if (pHeader->ddspf.size != 0 /* Known variant */
|
|
||||||
&& pHeader->ddspf.size != 24 /* Known variant */
|
|
||||||
&& pHeader->ddspf.size != sizeof(DDS_PIXELFORMAT))
|
|
||||||
{
|
|
||||||
return HRESULT_E_NOT_SUPPORTED;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (pHeader->ddspf.size != sizeof(DDS_PIXELFORMAT))
|
|
||||||
{
|
|
||||||
return HRESULT_E_NOT_SUPPORTED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
metadata.mipLevels = pHeader->mipMapCount;
|
metadata.mipLevels = pHeader->mipMapCount;
|
||||||
if (metadata.mipLevels == 0)
|
if (metadata.mipLevels == 0)
|
||||||
{
|
|
||||||
metadata.mipLevels = 1;
|
metadata.mipLevels = 1;
|
||||||
}
|
|
||||||
|
|
||||||
// Check for DX10 extension
|
// Check for DX10 extension
|
||||||
if ((pHeader->ddspf.flags & DDS_FOURCC)
|
if ((pHeader->ddspf.flags & DDS_FOURCC)
|
||||||
&& (MAKEFOURCC('D', 'X', '1', '0') == pHeader->ddspf.fourCC))
|
&& (MAKEFOURCC('D', 'X', '1', '0') == pHeader->ddspf.fourCC))
|
||||||
{
|
{
|
||||||
if (pHeader->size != sizeof(DDS_HEADER)
|
|
||||||
|| pHeader->ddspf.size != sizeof(DDS_PIXELFORMAT))
|
|
||||||
{
|
|
||||||
// We do not accept legacy DX9 'known variants' for modern "DX10" extension header files.
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Buffer must be big enough for both headers and magic value
|
// Buffer must be big enough for both headers and magic value
|
||||||
if (size < DDS_DX10_HEADER_SIZE)
|
if (size < (sizeof(DDS_HEADER) + sizeof(uint32_t) + sizeof(DDS_HEADER_DXT10)))
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto d3d10ext = reinterpret_cast<const DDS_HEADER_DXT10*>(static_cast<const uint8_t*>(pSource) + DDS_MIN_HEADER_SIZE);
|
auto d3d10ext = reinterpret_cast<const DDS_HEADER_DXT10*>(static_cast<const uint8_t*>(pSource) + sizeof(uint32_t) + sizeof(DDS_HEADER));
|
||||||
convFlags |= CONV_FLAGS_DX10;
|
convFlags |= CONV_FLAGS_DX10;
|
||||||
|
|
||||||
metadata.arraySize = d3d10ext->arraySize;
|
metadata.arraySize = d3d10ext->arraySize;
|
||||||
if (metadata.arraySize == 0)
|
if (metadata.arraySize == 0)
|
||||||
{
|
{
|
||||||
metadata.arraySize = 1;
|
return HRESULT_E_INVALID_DATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
metadata.format = d3d10ext->dxgiFormat;
|
metadata.format = d3d10ext->dxgiFormat;
|
||||||
@ -485,14 +427,6 @@ namespace
|
|||||||
metadata.height = pHeader->height;
|
metadata.height = pHeader->height;
|
||||||
metadata.depth = pHeader->depth;
|
metadata.depth = pHeader->depth;
|
||||||
metadata.dimension = TEX_DIMENSION_TEXTURE3D;
|
metadata.dimension = TEX_DIMENSION_TEXTURE3D;
|
||||||
|
|
||||||
if (flags & DDS_FLAGS_PERMISSIVE)
|
|
||||||
{
|
|
||||||
// Allow cases where mipCount was computed incorrectly
|
|
||||||
size_t maxMips = 0;
|
|
||||||
std::ignore = Internal::CalculateMipLevels3D(metadata.width, metadata.height, metadata.depth, maxMips);
|
|
||||||
metadata.mipLevels = std::min(metadata.mipLevels, maxMips);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -512,14 +446,6 @@ namespace
|
|||||||
metadata.dimension = TEX_DIMENSION_TEXTURE2D;
|
metadata.dimension = TEX_DIMENSION_TEXTURE2D;
|
||||||
|
|
||||||
// Note there's no way for a legacy Direct3D 9 DDS to express a '1D' texture
|
// Note there's no way for a legacy Direct3D 9 DDS to express a '1D' texture
|
||||||
|
|
||||||
if (flags & DDS_FLAGS_PERMISSIVE)
|
|
||||||
{
|
|
||||||
// Allow cases where mipCount was computed incorrectly
|
|
||||||
size_t maxMips = 0;
|
|
||||||
std::ignore = Internal::CalculateMipLevels(metadata.width, metadata.height, maxMips);
|
|
||||||
metadata.mipLevels = std::min(metadata.mipLevels, maxMips);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
metadata.format = GetDXGIFormat(*pHeader, pHeader->ddspf, flags, convFlags);
|
metadata.format = GetDXGIFormat(*pHeader, pHeader->ddspf, flags, convFlags);
|
||||||
@ -648,25 +574,6 @@ 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)
|
|
||||||
{
|
|
||||||
ddPixelFormat->size = pHeader->ddspf.size;
|
|
||||||
ddPixelFormat->flags = pHeader->ddspf.flags;
|
|
||||||
ddPixelFormat->fourCC = pHeader->ddspf.fourCC;
|
|
||||||
ddPixelFormat->RGBBitCount = pHeader->ddspf.RGBBitCount;
|
|
||||||
ddPixelFormat->RBitMask = pHeader->ddspf.RBitMask;
|
|
||||||
ddPixelFormat->GBitMask = pHeader->ddspf.GBitMask;
|
|
||||||
ddPixelFormat->BBitMask = pHeader->ddspf.BBitMask;
|
|
||||||
ddPixelFormat->ABitMask = pHeader->ddspf.ABitMask;
|
|
||||||
}
|
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -679,7 +586,7 @@ _Use_decl_annotations_
|
|||||||
HRESULT DirectX::EncodeDDSHeader(
|
HRESULT DirectX::EncodeDDSHeader(
|
||||||
const TexMetadata& metadata,
|
const TexMetadata& metadata,
|
||||||
DDS_FLAGS flags,
|
DDS_FLAGS flags,
|
||||||
uint8_t* pDestination,
|
void* pDestination,
|
||||||
size_t maxsize,
|
size_t maxsize,
|
||||||
size_t& required) noexcept
|
size_t& required) noexcept
|
||||||
{
|
{
|
||||||
@ -839,7 +746,7 @@ HRESULT DirectX::EncodeDDSHeader(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
required = DDS_MIN_HEADER_SIZE;
|
required = sizeof(uint32_t) + sizeof(DDS_HEADER);
|
||||||
|
|
||||||
if (ddpf.size == 0)
|
if (ddpf.size == 0)
|
||||||
{
|
{
|
||||||
@ -855,7 +762,7 @@ HRESULT DirectX::EncodeDDSHeader(
|
|||||||
if (maxsize < required)
|
if (maxsize < required)
|
||||||
return E_NOT_SUFFICIENT_BUFFER;
|
return E_NOT_SUFFICIENT_BUFFER;
|
||||||
|
|
||||||
*reinterpret_cast<uint32_t*>(pDestination) = DDS_MAGIC;
|
*static_cast<uint32_t*>(pDestination) = DDS_MAGIC;
|
||||||
|
|
||||||
auto header = reinterpret_cast<DDS_HEADER*>(static_cast<uint8_t*>(pDestination) + sizeof(uint32_t));
|
auto header = reinterpret_cast<DDS_HEADER*>(static_cast<uint8_t*>(pDestination) + sizeof(uint32_t));
|
||||||
assert(header);
|
assert(header);
|
||||||
@ -1011,10 +918,7 @@ namespace
|
|||||||
TEXP_LEGACY_B4G4R4A4,
|
TEXP_LEGACY_B4G4R4A4,
|
||||||
TEXP_LEGACY_L8,
|
TEXP_LEGACY_L8,
|
||||||
TEXP_LEGACY_L16,
|
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
|
constexpr TEXP_LEGACY_FORMAT FindLegacyFormat(uint32_t flags) noexcept
|
||||||
@ -1041,12 +945,6 @@ namespace
|
|||||||
lformat = TEXP_LEGACY_L16;
|
lformat = TEXP_LEGACY_L16;
|
||||||
else if (flags & CONV_FLAGS_A8L8)
|
else if (flags & CONV_FLAGS_A8L8)
|
||||||
lformat = TEXP_LEGACY_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;
|
return lformat;
|
||||||
}
|
}
|
||||||
@ -1352,120 +1250,11 @@ namespace
|
|||||||
}
|
}
|
||||||
return false;
|
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:
|
default:
|
||||||
return false;
|
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
|
// Converts or copies image data from pPixels into scratch image data
|
||||||
@ -1489,7 +1278,7 @@ namespace
|
|||||||
{
|
{
|
||||||
if (convFlags & CONV_FLAGS_888)
|
if (convFlags & CONV_FLAGS_888)
|
||||||
cpFlags |= CP_FLAGS_24BPP;
|
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 | CONV_FLAGS_L6V5U5))
|
else if (convFlags & (CONV_FLAGS_565 | CONV_FLAGS_5551 | CONV_FLAGS_4444 | CONV_FLAGS_8332 | CONV_FLAGS_A8P8 | CONV_FLAGS_L16 | CONV_FLAGS_A8L8))
|
||||||
cpFlags |= CP_FLAGS_16BPP;
|
cpFlags |= CP_FLAGS_16BPP;
|
||||||
else if (convFlags & (CONV_FLAGS_44 | CONV_FLAGS_332 | CONV_FLAGS_PAL8 | CONV_FLAGS_L8))
|
else if (convFlags & (CONV_FLAGS_44 | CONV_FLAGS_332 | CONV_FLAGS_PAL8 | CONV_FLAGS_L8))
|
||||||
cpFlags |= CP_FLAGS_8BPP;
|
cpFlags |= CP_FLAGS_8BPP;
|
||||||
@ -1635,18 +1424,13 @@ namespace
|
|||||||
}
|
}
|
||||||
else if (convFlags & CONV_FLAGS_SWIZZLE)
|
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
|
else
|
||||||
{
|
{
|
||||||
CopyScanline(pDest, dpitch, pSrc, spitch, metadata.format, tflags);
|
CopyScanline(pDest, dpitch, pSrc, spitch,
|
||||||
|
metadata.format, tflags);
|
||||||
}
|
}
|
||||||
|
|
||||||
pSrc += spitch;
|
pSrc += spitch;
|
||||||
@ -1743,13 +1527,6 @@ namespace
|
|||||||
{
|
{
|
||||||
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
|
else
|
||||||
{
|
{
|
||||||
CopyScanline(pDest, dpitch, pSrc, spitch, metadata.format, tflags);
|
CopyScanline(pDest, dpitch, pSrc, spitch, metadata.format, tflags);
|
||||||
@ -1807,14 +1584,6 @@ namespace
|
|||||||
{
|
{
|
||||||
SwizzleScanline(pPixels, rowPitch, pPixels, rowPitch, metadata.format, tflags);
|
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
|
else
|
||||||
{
|
{
|
||||||
CopyScanline(pPixels, rowPitch, pPixels, rowPitch, metadata.format, tflags);
|
CopyScanline(pPixels, rowPitch, pPixels, rowPitch, metadata.format, tflags);
|
||||||
@ -1839,27 +1608,16 @@ namespace
|
|||||||
|
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
HRESULT DirectX::GetMetadataFromDDSMemory(
|
HRESULT DirectX::GetMetadataFromDDSMemory(
|
||||||
const uint8_t* pSource,
|
const void* pSource,
|
||||||
size_t size,
|
size_t size,
|
||||||
DDS_FLAGS flags,
|
DDS_FLAGS flags,
|
||||||
TexMetadata& metadata) noexcept
|
TexMetadata& metadata) noexcept
|
||||||
{
|
|
||||||
return GetMetadataFromDDSMemoryEx(pSource, size, flags, metadata, nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT DirectX::GetMetadataFromDDSMemoryEx(
|
|
||||||
const uint8_t* pSource,
|
|
||||||
size_t size,
|
|
||||||
DDS_FLAGS flags,
|
|
||||||
TexMetadata& metadata,
|
|
||||||
DDSMetaData* ddPixelFormat) noexcept
|
|
||||||
{
|
{
|
||||||
if (!pSource || size == 0)
|
if (!pSource || size == 0)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
uint32_t convFlags = 0;
|
uint32_t convFlags = 0;
|
||||||
return DecodeDDSHeader(pSource, size, flags, metadata, ddPixelFormat, convFlags);
|
return DecodeDDSHeader(pSource, size, flags, metadata, convFlags);
|
||||||
}
|
}
|
||||||
|
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
@ -1867,25 +1625,17 @@ HRESULT DirectX::GetMetadataFromDDSFile(
|
|||||||
const wchar_t* szFile,
|
const wchar_t* szFile,
|
||||||
DDS_FLAGS flags,
|
DDS_FLAGS flags,
|
||||||
TexMetadata& metadata) noexcept
|
TexMetadata& metadata) noexcept
|
||||||
{
|
|
||||||
return GetMetadataFromDDSFileEx(szFile, flags, metadata, nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT DirectX::GetMetadataFromDDSFileEx(
|
|
||||||
const wchar_t* szFile,
|
|
||||||
DDS_FLAGS flags,
|
|
||||||
TexMetadata& metadata,
|
|
||||||
DDSMetaData* ddPixelFormat) noexcept
|
|
||||||
{
|
{
|
||||||
if (!szFile)
|
if (!szFile)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
szFile,
|
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
|
||||||
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
#else
|
||||||
nullptr)));
|
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
|
||||||
|
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
|
||||||
|
#endif
|
||||||
if (!hFile)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -1925,24 +1675,24 @@ HRESULT DirectX::GetMetadataFromDDSFileEx(
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Need at least enough data to fill the standard header and magic number to be a valid DDS
|
// Need at least enough data to fill the standard header and magic number to be a valid DDS
|
||||||
if (len < DDS_MIN_HEADER_SIZE)
|
if (len < (sizeof(DDS_HEADER) + sizeof(uint32_t)))
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read the header in (including extended header if present)
|
// Read the header in (including extended header if present)
|
||||||
uint8_t header[DDS_DX10_HEADER_SIZE] = {};
|
uint8_t header[MAX_HEADER_SIZE] = {};
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
DWORD bytesRead = 0;
|
DWORD bytesRead = 0;
|
||||||
if (!ReadFile(hFile.get(), header, DDS_DX10_HEADER_SIZE, &bytesRead, nullptr))
|
if (!ReadFile(hFile.get(), header, MAX_HEADER_SIZE, &bytesRead, nullptr))
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto headerLen = static_cast<size_t>(bytesRead);
|
auto const headerLen = static_cast<size_t>(bytesRead);
|
||||||
#else
|
#else
|
||||||
const auto headerLen = std::min<size_t>(len, DDS_DX10_HEADER_SIZE);
|
auto const headerLen = std::min<size_t>(len, MAX_HEADER_SIZE);
|
||||||
|
|
||||||
inFile.read(reinterpret_cast<char*>(header), headerLen);
|
inFile.read(reinterpret_cast<char*>(header), headerLen);
|
||||||
if (!inFile)
|
if (!inFile)
|
||||||
@ -1950,7 +1700,7 @@ HRESULT DirectX::GetMetadataFromDDSFileEx(
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
uint32_t convFlags = 0;
|
uint32_t convFlags = 0;
|
||||||
return DecodeDDSHeader(header, headerLen, flags, metadata, ddPixelFormat, convFlags);
|
return DecodeDDSHeader(header, headerLen, flags, metadata, convFlags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -1959,23 +1709,11 @@ HRESULT DirectX::GetMetadataFromDDSFileEx(
|
|||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
HRESULT DirectX::LoadFromDDSMemory(
|
HRESULT DirectX::LoadFromDDSMemory(
|
||||||
const uint8_t* pSource,
|
const void* pSource,
|
||||||
size_t size,
|
size_t size,
|
||||||
DDS_FLAGS flags,
|
DDS_FLAGS flags,
|
||||||
TexMetadata* metadata,
|
TexMetadata* metadata,
|
||||||
ScratchImage& image) noexcept
|
ScratchImage& image) noexcept
|
||||||
{
|
|
||||||
return LoadFromDDSMemoryEx(pSource, size, flags, metadata, nullptr, image);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT DirectX::LoadFromDDSMemoryEx(
|
|
||||||
const uint8_t* pSource,
|
|
||||||
size_t size,
|
|
||||||
DDS_FLAGS flags,
|
|
||||||
TexMetadata* metadata,
|
|
||||||
DDSMetaData* ddPixelFormat,
|
|
||||||
ScratchImage& image) noexcept
|
|
||||||
{
|
{
|
||||||
if (!pSource || size == 0)
|
if (!pSource || size == 0)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
@ -1984,11 +1722,11 @@ HRESULT DirectX::LoadFromDDSMemoryEx(
|
|||||||
|
|
||||||
uint32_t convFlags = 0;
|
uint32_t convFlags = 0;
|
||||||
TexMetadata mdata;
|
TexMetadata mdata;
|
||||||
HRESULT hr = DecodeDDSHeader(pSource, size, flags, mdata, ddPixelFormat, convFlags);
|
HRESULT hr = DecodeDDSHeader(pSource, size, flags, mdata, convFlags);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
size_t offset = DDS_MIN_HEADER_SIZE;
|
size_t offset = sizeof(uint32_t) + sizeof(DDS_HEADER);
|
||||||
if (convFlags & CONV_FLAGS_DX10)
|
if (convFlags & CONV_FLAGS_DX10)
|
||||||
offset += sizeof(DDS_HEADER_DXT10);
|
offset += sizeof(DDS_HEADER_DXT10);
|
||||||
|
|
||||||
@ -2004,36 +1742,10 @@ HRESULT DirectX::LoadFromDDSMemoryEx(
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t remaining = size - offset;
|
|
||||||
if (remaining == 0)
|
|
||||||
return E_FAIL;
|
|
||||||
|
|
||||||
hr = image.Initialize(mdata);
|
hr = image.Initialize(mdata);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return 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;
|
CP_FLAGS cflags = CP_FLAGS_NONE;
|
||||||
if (flags & DDS_FLAGS_LEGACY_DWORD)
|
if (flags & DDS_FLAGS_LEGACY_DWORD)
|
||||||
{
|
{
|
||||||
@ -2074,17 +1786,6 @@ HRESULT DirectX::LoadFromDDSFile(
|
|||||||
DDS_FLAGS flags,
|
DDS_FLAGS flags,
|
||||||
TexMetadata* metadata,
|
TexMetadata* metadata,
|
||||||
ScratchImage& image) noexcept
|
ScratchImage& image) noexcept
|
||||||
{
|
|
||||||
return LoadFromDDSFileEx(szFile, flags, metadata, nullptr, image);
|
|
||||||
}
|
|
||||||
|
|
||||||
_Use_decl_annotations_
|
|
||||||
HRESULT DirectX::LoadFromDDSFileEx(
|
|
||||||
const wchar_t* szFile,
|
|
||||||
DDS_FLAGS flags,
|
|
||||||
TexMetadata* metadata,
|
|
||||||
DDSMetaData* ddPixelFormat,
|
|
||||||
ScratchImage& image) noexcept
|
|
||||||
{
|
{
|
||||||
if (!szFile)
|
if (!szFile)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
@ -2092,10 +1793,12 @@ HRESULT DirectX::LoadFromDDSFileEx(
|
|||||||
image.Release();
|
image.Release();
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
szFile,
|
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
|
||||||
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
#else
|
||||||
nullptr)));
|
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
|
||||||
|
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
|
||||||
|
#endif
|
||||||
if (!hFile)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -2133,24 +1836,24 @@ HRESULT DirectX::LoadFromDDSFileEx(
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Need at least enough data to fill the standard header and magic number to be a valid DDS
|
// Need at least enough data to fill the standard header and magic number to be a valid DDS
|
||||||
if (len < DDS_MIN_HEADER_SIZE)
|
if (len < (sizeof(DDS_HEADER) + sizeof(uint32_t)))
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read the header in (including extended header if present)
|
// Read the header in (including extended header if present)
|
||||||
uint8_t header[DDS_DX10_HEADER_SIZE] = {};
|
uint8_t header[MAX_HEADER_SIZE] = {};
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
DWORD bytesRead = 0;
|
DWORD bytesRead = 0;
|
||||||
if (!ReadFile(hFile.get(), header, DDS_DX10_HEADER_SIZE, &bytesRead, nullptr))
|
if (!ReadFile(hFile.get(), header, MAX_HEADER_SIZE, &bytesRead, nullptr))
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto headerLen = static_cast<size_t>(bytesRead);
|
auto const headerLen = static_cast<size_t>(bytesRead);
|
||||||
#else
|
#else
|
||||||
const auto headerLen = std::min<size_t>(len, DDS_DX10_HEADER_SIZE);
|
auto const headerLen = std::min<size_t>(len, MAX_HEADER_SIZE);
|
||||||
|
|
||||||
inFile.read(reinterpret_cast<char*>(header), headerLen);
|
inFile.read(reinterpret_cast<char*>(header), headerLen);
|
||||||
if (!inFile)
|
if (!inFile)
|
||||||
@ -2159,28 +1862,28 @@ HRESULT DirectX::LoadFromDDSFileEx(
|
|||||||
|
|
||||||
uint32_t convFlags = 0;
|
uint32_t convFlags = 0;
|
||||||
TexMetadata mdata;
|
TexMetadata mdata;
|
||||||
HRESULT hr = DecodeDDSHeader(header, headerLen, flags, mdata, ddPixelFormat, convFlags);
|
HRESULT hr = DecodeDDSHeader(header, headerLen, flags, mdata, convFlags);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
size_t offset = DDS_DX10_HEADER_SIZE;
|
size_t offset = MAX_HEADER_SIZE;
|
||||||
|
|
||||||
if (!(convFlags & CONV_FLAGS_DX10))
|
if (!(convFlags & CONV_FLAGS_DX10))
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
// Must reset file position since we read more than the standard header above
|
// Must reset file position since we read more than the standard header above
|
||||||
const LARGE_INTEGER filePos = { { DDS_MIN_HEADER_SIZE, 0 } };
|
const LARGE_INTEGER filePos = { { sizeof(uint32_t) + sizeof(DDS_HEADER), 0 } };
|
||||||
if (!SetFilePointerEx(hFile.get(), filePos, nullptr, FILE_BEGIN))
|
if (!SetFilePointerEx(hFile.get(), filePos, nullptr, FILE_BEGIN))
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
inFile.seekg(DDS_MIN_HEADER_SIZE, std::ios::beg);
|
inFile.seekg(sizeof(uint32_t) + sizeof(DDS_HEADER), std::ios::beg);
|
||||||
if (!inFile)
|
if (!inFile)
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
offset = DDS_MIN_HEADER_SIZE;
|
offset = sizeof(uint32_t) + sizeof(DDS_HEADER);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<uint32_t[]> pal8;
|
std::unique_ptr<uint32_t[]> pal8;
|
||||||
@ -2219,28 +1922,6 @@ HRESULT DirectX::LoadFromDDSFileEx(
|
|||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return 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)))
|
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]);
|
std::unique_ptr<uint8_t[]> temp(new (std::nothrow) uint8_t[remaining]);
|
||||||
@ -2309,7 +1990,7 @@ HRESULT DirectX::LoadFromDDSFileEx(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
const auto pixelBytes = static_cast<DWORD>(image.GetPixelsSize());
|
auto const pixelBytes = static_cast<DWORD>(image.GetPixelsSize());
|
||||||
if (!ReadFile(hFile.get(), image.GetPixels(), pixelBytes, &bytesRead, nullptr))
|
if (!ReadFile(hFile.get(), image.GetPixels(), pixelBytes, &bytesRead, nullptr))
|
||||||
{
|
{
|
||||||
image.Release();
|
image.Release();
|
||||||
@ -2330,7 +2011,7 @@ HRESULT DirectX::LoadFromDDSFileEx(
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (convFlags & (CONV_FLAGS_SWIZZLE | CONV_FLAGS_NOALPHA | CONV_FLAGS_L8U8V8 | CONV_FLAGS_WUV10))
|
if (convFlags & (CONV_FLAGS_SWIZZLE | CONV_FLAGS_NOALPHA))
|
||||||
{
|
{
|
||||||
// Swizzle/copy image in place
|
// Swizzle/copy image in place
|
||||||
hr = CopyImageInPlace(convFlags, image);
|
hr = CopyImageInPlace(convFlags, image);
|
||||||
@ -2403,7 +2084,7 @@ HRESULT DirectX::SaveToDDSMemory(
|
|||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
auto pDestination = blob.GetBufferPointer();
|
auto pDestination = static_cast<uint8_t*>(blob.GetBufferPointer());
|
||||||
assert(pDestination);
|
assert(pDestination);
|
||||||
|
|
||||||
hr = EncodeDDSHeader(metadata, flags, pDestination, blob.GetBufferSize(), required);
|
hr = EncodeDDSHeader(metadata, flags, pDestination, blob.GetBufferSize(), required);
|
||||||
@ -2416,7 +2097,7 @@ HRESULT DirectX::SaveToDDSMemory(
|
|||||||
size_t remaining = blob.GetBufferSize() - required;
|
size_t remaining = blob.GetBufferSize() - required;
|
||||||
pDestination += required;
|
pDestination += required;
|
||||||
|
|
||||||
if (remaining == 0)
|
if (!remaining)
|
||||||
{
|
{
|
||||||
blob.Release();
|
blob.Release();
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
@ -2588,17 +2269,21 @@ HRESULT DirectX::SaveToDDSFile(
|
|||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
// Create DDS Header
|
// Create DDS Header
|
||||||
uint8_t header[DDS_DX10_HEADER_SIZE];
|
uint8_t header[MAX_HEADER_SIZE];
|
||||||
size_t required;
|
size_t required;
|
||||||
HRESULT hr = EncodeDDSHeader(metadata, flags, header, DDS_DX10_HEADER_SIZE, required);
|
HRESULT hr = EncodeDDSHeader(metadata, flags, header, MAX_HEADER_SIZE, required);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
// Create file and write header
|
// Create file and write header
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
szFile,
|
ScopedHandle hFile(safe_handle(CreateFile2(szFile,
|
||||||
GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr)));
|
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)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -2807,68 +2492,3 @@ HRESULT DirectX::SaveToDDSFile(
|
|||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// Adapters for /Zc:wchar_t- clients
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
|
|
||||||
|
|
||||||
namespace DirectX
|
|
||||||
{
|
|
||||||
HRESULT __cdecl GetMetadataFromDDSFile(
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_In_ DDS_FLAGS flags,
|
|
||||||
_Out_ TexMetadata& metadata) noexcept
|
|
||||||
{
|
|
||||||
return GetMetadataFromDDSFile(reinterpret_cast<const unsigned short*>(szFile), flags, metadata);
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT __cdecl GetMetadataFromDDSFileEx(
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_In_ DDS_FLAGS flags,
|
|
||||||
_Out_ TexMetadata& metadata,
|
|
||||||
_Out_opt_ DDSMetaData* ddPixelFormat) noexcept
|
|
||||||
{
|
|
||||||
return GetMetadataFromDDSFileEx(reinterpret_cast<const unsigned short*>(szFile), flags, metadata, ddPixelFormat);
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT __cdecl LoadFromDDSFile(
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_In_ DDS_FLAGS flags,
|
|
||||||
_Out_opt_ TexMetadata* metadata,
|
|
||||||
_Out_ ScratchImage& image) noexcept
|
|
||||||
{
|
|
||||||
return LoadFromDDSFile(reinterpret_cast<const unsigned short*>(szFile), flags, metadata, image);
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
{
|
|
||||||
return LoadFromDDSFileEx(reinterpret_cast<const unsigned short*>(szFile), flags, metadata, ddPixelFormat, image);
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT __cdecl SaveToDDSFile(
|
|
||||||
_In_ const Image& image,
|
|
||||||
_In_ DDS_FLAGS flags,
|
|
||||||
_In_z_ const __wchar_t* szFile) noexcept
|
|
||||||
{
|
|
||||||
return SaveToDDSFile(image, flags, reinterpret_cast<const unsigned short*>(szFile));
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
{
|
|
||||||
return SaveToDDSFile(images, nimages, metadata, flags, reinterpret_cast<const unsigned short*>(szFile));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // !_NATIVE_WCHAR_T_DEFINED
|
|
||||||
|
|||||||
@ -94,7 +94,7 @@ namespace
|
|||||||
// Decodes HDR header
|
// Decodes HDR header
|
||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
HRESULT DecodeHDRHeader(
|
HRESULT DecodeHDRHeader(
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource,
|
_In_reads_bytes_(size) const void* pSource,
|
||||||
size_t size,
|
size_t size,
|
||||||
_Out_ TexMetadata& metadata,
|
_Out_ TexMetadata& metadata,
|
||||||
size_t& offset,
|
size_t& offset,
|
||||||
@ -121,7 +121,7 @@ namespace
|
|||||||
|
|
||||||
// Process first part of header
|
// Process first part of header
|
||||||
bool formatFound = false;
|
bool formatFound = false;
|
||||||
auto info = reinterpret_cast<const char*>(pSource);
|
auto info = static_cast<const char*>(pSource);
|
||||||
while (size > 0)
|
while (size > 0)
|
||||||
{
|
{
|
||||||
if (*info == '\n')
|
if (*info == '\n')
|
||||||
@ -163,8 +163,7 @@ namespace
|
|||||||
formatFound = true;
|
formatFound = true;
|
||||||
|
|
||||||
const size_t len = FindEOL(info, size);
|
const size_t len = FindEOL(info, size);
|
||||||
if (len == size_t(-1)
|
if (len == size_t(-1))
|
||||||
|| len < 1)
|
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
@ -208,8 +207,7 @@ namespace
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
const size_t len = FindEOL(info, size);
|
const size_t len = FindEOL(info, size);
|
||||||
if (len == size_t(-1)
|
if (len == size_t(-1))
|
||||||
|| len < 1)
|
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
@ -249,11 +247,6 @@ namespace
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (height > UINT16_MAX)
|
|
||||||
{
|
|
||||||
return HRESULT_E_NOT_SUPPORTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
const char* ptr = orientation + 2;
|
const char* ptr = orientation + 2;
|
||||||
while (*ptr != 0 && *ptr != '-' && *ptr != '+')
|
while (*ptr != 0 && *ptr != '-' && *ptr != '+')
|
||||||
++ptr;
|
++ptr;
|
||||||
@ -286,11 +279,6 @@ namespace
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (width > UINT16_MAX)
|
|
||||||
{
|
|
||||||
return HRESULT_E_NOT_SUPPORTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
info += len + 1;
|
info += len + 1;
|
||||||
size -= len + 1;
|
size -= len + 1;
|
||||||
|
|
||||||
@ -299,18 +287,12 @@ namespace
|
|||||||
return HRESULT_E_INVALID_DATA;
|
return HRESULT_E_INVALID_DATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t sizeBytes = uint64_t(width) * uint64_t(height) * sizeof(float) * 4;
|
|
||||||
if (sizeBytes > UINT32_MAX)
|
|
||||||
{
|
|
||||||
return HRESULT_E_ARITHMETIC_OVERFLOW;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (size == 0)
|
if (size == 0)
|
||||||
{
|
{
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
offset = size_t(info - reinterpret_cast<const char*>(pSource));
|
offset = size_t(info - static_cast<const char*>(pSource));
|
||||||
|
|
||||||
metadata.width = width;
|
metadata.width = width;
|
||||||
metadata.height = height;
|
metadata.height = height;
|
||||||
@ -600,7 +582,7 @@ namespace
|
|||||||
// Obtain metadata from HDR file in memory/on disk
|
// Obtain metadata from HDR file in memory/on disk
|
||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
HRESULT DirectX::GetMetadataFromHDRMemory(const uint8_t* pSource, size_t size, TexMetadata& metadata) noexcept
|
HRESULT DirectX::GetMetadataFromHDRMemory(const void* pSource, size_t size, TexMetadata& metadata) noexcept
|
||||||
{
|
{
|
||||||
if (!pSource || size == 0)
|
if (!pSource || size == 0)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
@ -617,10 +599,12 @@ HRESULT DirectX::GetMetadataFromHDRFile(const wchar_t* szFile, TexMetadata& meta
|
|||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
szFile,
|
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
|
||||||
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
#else
|
||||||
nullptr)));
|
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
|
||||||
|
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
|
||||||
|
#endif
|
||||||
if (!hFile)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -675,9 +659,9 @@ HRESULT DirectX::GetMetadataFromHDRFile(const wchar_t* szFile, TexMetadata& meta
|
|||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto headerLen = static_cast<size_t>(bytesRead);
|
auto const headerLen = static_cast<size_t>(bytesRead);
|
||||||
#else
|
#else
|
||||||
const auto headerLen = std::min<size_t>(sizeof(header), len);
|
auto const headerLen = std::min<size_t>(sizeof(header), len);
|
||||||
|
|
||||||
inFile.read(reinterpret_cast<char*>(header), headerLen);
|
inFile.read(reinterpret_cast<char*>(header), headerLen);
|
||||||
if (!inFile)
|
if (!inFile)
|
||||||
@ -694,7 +678,7 @@ HRESULT DirectX::GetMetadataFromHDRFile(const wchar_t* szFile, TexMetadata& meta
|
|||||||
// Load a HDR file in memory
|
// Load a HDR file in memory
|
||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
HRESULT DirectX::LoadFromHDRMemory(const uint8_t* pSource, size_t size, TexMetadata* metadata, ScratchImage& image) noexcept
|
HRESULT DirectX::LoadFromHDRMemory(const void* pSource, size_t size, TexMetadata* metadata, ScratchImage& image) noexcept
|
||||||
{
|
{
|
||||||
if (!pSource || size == 0)
|
if (!pSource || size == 0)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
@ -715,7 +699,7 @@ HRESULT DirectX::LoadFromHDRMemory(const uint8_t* pSource, size_t size, TexMetad
|
|||||||
if (remaining == 0)
|
if (remaining == 0)
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
||||||
hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1, CP_FLAGS_LIMIT_4GB);
|
hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
@ -890,7 +874,7 @@ HRESULT DirectX::LoadFromHDRMemory(const uint8_t* pSource, size_t size, TexMetad
|
|||||||
|
|
||||||
for (size_t j = 0; j < image.GetPixelsSize(); j += 16)
|
for (size_t j = 0; j < image.GetPixelsSize(); j += 16)
|
||||||
{
|
{
|
||||||
const auto exponent = static_cast<int>(fdata[3]);
|
auto const exponent = static_cast<int>(fdata[3]);
|
||||||
fdata[0] = 1.0f / exposure*ldexpf((fdata[0] + 0.5f), exponent - (128 + 8));
|
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[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));
|
fdata[2] = 1.0f / exposure*ldexpf((fdata[2] + 0.5f), exponent - (128 + 8));
|
||||||
@ -919,10 +903,12 @@ HRESULT DirectX::LoadFromHDRFile(const wchar_t* szFile, TexMetadata* metadata, S
|
|||||||
image.Release();
|
image.Release();
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
szFile,
|
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
|
||||||
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
#else
|
||||||
nullptr)));
|
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
|
||||||
|
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
|
||||||
|
#endif
|
||||||
if (!hFile)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -1041,7 +1027,7 @@ HRESULT DirectX::SaveToHDRMemory(const Image& image, Blob& blob) noexcept
|
|||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
// Copy header
|
// Copy header
|
||||||
auto dPtr = blob.GetBufferPointer();
|
auto dPtr = static_cast<uint8_t*>(blob.GetBufferPointer());
|
||||||
assert(dPtr != nullptr);
|
assert(dPtr != nullptr);
|
||||||
memcpy(dPtr, header, headerLen);
|
memcpy(dPtr, header, headerLen);
|
||||||
dPtr += headerLen;
|
dPtr += headerLen;
|
||||||
@ -1093,7 +1079,7 @@ HRESULT DirectX::SaveToHDRMemory(const Image& image, Blob& blob) noexcept
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
hr = blob.Trim(size_t(dPtr - blob.GetConstBufferPointer()));
|
hr = blob.Trim(size_t(dPtr - static_cast<uint8_t*>(blob.GetBufferPointer())));
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
blob.Release();
|
blob.Release();
|
||||||
@ -1140,9 +1126,13 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce
|
|||||||
|
|
||||||
// Create file and write header
|
// Create file and write header
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
szFile,
|
ScopedHandle hFile(safe_handle(CreateFile2(szFile,
|
||||||
GENERIC_WRITE, 0, CREATE_ALWAYS, nullptr)));
|
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)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -1174,9 +1164,9 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce
|
|||||||
|
|
||||||
// Write blob
|
// Write blob
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
const auto bytesToWrite = static_cast<const DWORD>(blob.GetBufferSize());
|
auto const bytesToWrite = static_cast<const DWORD>(blob.GetBufferSize());
|
||||||
DWORD bytesWritten;
|
DWORD bytesWritten;
|
||||||
if (!WriteFile(hFile.get(), blob.GetConstBufferPointer(), bytesToWrite, &bytesWritten, nullptr))
|
if (!WriteFile(hFile.get(), blob.GetBufferPointer(), bytesToWrite, &bytesWritten, nullptr))
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
}
|
}
|
||||||
@ -1186,7 +1176,7 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
outFile.write(reinterpret_cast<const char*>(blob.GetConstBufferPointer()),
|
outFile.write(reinterpret_cast<char*>(blob.GetBufferPointer()),
|
||||||
static_cast<std::streamsize>(blob.GetBufferSize()));
|
static_cast<std::streamsize>(blob.GetBufferSize()));
|
||||||
|
|
||||||
if (!outFile)
|
if (!outFile)
|
||||||
@ -1207,7 +1197,7 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce
|
|||||||
sprintf_s(header, g_Header, image.height, image.width);
|
sprintf_s(header, g_Header, image.height, image.width);
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
const auto headerLen = static_cast<DWORD>(strlen(header));
|
auto const headerLen = static_cast<DWORD>(strlen(header));
|
||||||
|
|
||||||
DWORD bytesWritten;
|
DWORD bytesWritten;
|
||||||
if (!WriteFile(hFile.get(), header, headerLen, &bytesWritten, nullptr))
|
if (!WriteFile(hFile.get(), header, headerLen, &bytesWritten, nullptr))
|
||||||
@ -1308,36 +1298,3 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce
|
|||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// Adapters for /Zc:wchar_t- clients
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
|
|
||||||
|
|
||||||
namespace DirectX
|
|
||||||
{
|
|
||||||
HRESULT __cdecl GetMetadataFromHDRFile(
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_Out_ TexMetadata& metadata) noexcept
|
|
||||||
{
|
|
||||||
return GetMetadataFromHDRFile(reinterpret_cast<const unsigned short*>(szFile), metadata);
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT __cdecl LoadFromHDRFile(
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_Out_opt_ TexMetadata* metadata,
|
|
||||||
_Out_ ScratchImage& image) noexcept
|
|
||||||
{
|
|
||||||
return LoadFromHDRFile(reinterpret_cast<const unsigned short*>(szFile), metadata, image);
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT __cdecl SaveToHDRFile(
|
|
||||||
_In_ const Image& image,
|
|
||||||
_In_z_ const __wchar_t* szFile) noexcept
|
|
||||||
{
|
|
||||||
return SaveToHDRFile(image, reinterpret_cast<const unsigned short*>(szFile));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // !_NATIVE_WCHAR_T_DEFINED
|
|
||||||
|
|||||||
@ -123,12 +123,6 @@ HRESULT DirectX::Internal::DetermineImageArray(
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
static_assert(sizeof(size_t) == 8, "Not a 64-bit platform!");
|
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
|
#endif
|
||||||
|
|
||||||
nImages = nimages;
|
nImages = nimages;
|
||||||
@ -461,9 +455,6 @@ HRESULT ScratchImage::Initialize3D(DXGI_FORMAT fmt, size_t width, size_t height,
|
|||||||
if (!IsValid(fmt) || !width || !height || !depth)
|
if (!IsValid(fmt) || !width || !height || !depth)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
if (depth > INT16_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
if (IsPalettized(fmt))
|
if (IsPalettized(fmt))
|
||||||
return HRESULT_E_NOT_SUPPORTED;
|
return HRESULT_E_NOT_SUPPORTED;
|
||||||
|
|
||||||
@ -652,9 +643,6 @@ HRESULT ScratchImage::Initialize3DFromImages(const Image* images, size_t depth,
|
|||||||
if (!images || !depth)
|
if (!images || !depth)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
if (depth > INT16_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
const DXGI_FORMAT format = images[0].format;
|
const DXGI_FORMAT format = images[0].format;
|
||||||
const size_t width = images[0].width;
|
const size_t width = images[0].width;
|
||||||
const size_t height = images[0].height;
|
const size_t height = images[0].height;
|
||||||
|
|||||||
@ -71,16 +71,13 @@ namespace
|
|||||||
_In_ IWICBitmap* src,
|
_In_ IWICBitmap* src,
|
||||||
_In_ TEX_FILTER_FLAGS filter,
|
_In_ TEX_FILTER_FLAGS filter,
|
||||||
_In_ const WICPixelFormatGUID& desiredPixelFormat,
|
_In_ const WICPixelFormatGUID& desiredPixelFormat,
|
||||||
__RPC__deref_out_opt /* needed to match WIC annotation */ IWICBitmap** dest) noexcept
|
_Deref_out_ IWICBitmap** dest) noexcept
|
||||||
{
|
{
|
||||||
if (!dest)
|
if (!pWIC || !src || !dest)
|
||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
|
|
||||||
*dest = nullptr;
|
*dest = nullptr;
|
||||||
|
|
||||||
if (!pWIC || !src)
|
|
||||||
return E_POINTER;
|
|
||||||
|
|
||||||
WICPixelFormatGUID actualPixelFormat;
|
WICPixelFormatGUID actualPixelFormat;
|
||||||
HRESULT hr = src->GetPixelFormat(&actualPixelFormat);
|
HRESULT hr = src->GetPixelFormat(&actualPixelFormat);
|
||||||
|
|
||||||
@ -457,12 +454,16 @@ HRESULT DirectX::Internal::ResizeSeparateColorAndAlpha(
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
#if(_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
|
||||||
if (iswic2)
|
if (iswic2)
|
||||||
{
|
{
|
||||||
colorBytesInPixel = colorBytesPerPixel = 12;
|
colorBytesInPixel = colorBytesPerPixel = 12;
|
||||||
colorPixelFormat = GUID_WICPixelFormat96bppRGBFloat;
|
colorPixelFormat = GUID_WICPixelFormat96bppRGBFloat;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#else
|
||||||
|
UNREFERENCED_PARAMETER(iswic2);
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
colorBytesInPixel = 12;
|
colorBytesInPixel = 12;
|
||||||
colorBytesPerPixel = 16;
|
colorBytesPerPixel = 16;
|
||||||
@ -1146,7 +1147,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t y = 0; y < nheight; ++y)
|
for (size_t y = 0; y < nheight; ++y)
|
||||||
{
|
{
|
||||||
const auto& toY = lfY[y];
|
auto const& toY = lfY[y];
|
||||||
|
|
||||||
if (toY.u0 != u0)
|
if (toY.u0 != u0)
|
||||||
{
|
{
|
||||||
@ -1176,7 +1177,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t x = 0; x < nwidth; ++x)
|
for (size_t x = 0; x < nwidth; ++x)
|
||||||
{
|
{
|
||||||
const auto& toX = lfX[x];
|
auto const& toX = lfX[x];
|
||||||
|
|
||||||
BILINEAR_INTERPOLATE(target[x], toX, toY, row0, row1)
|
BILINEAR_INTERPOLATE(target[x], toX, toY, row0, row1)
|
||||||
}
|
}
|
||||||
@ -1269,7 +1270,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t y = 0; y < nheight; ++y)
|
for (size_t y = 0; y < nheight; ++y)
|
||||||
{
|
{
|
||||||
const auto& toY = cfY[y];
|
auto const& toY = cfY[y];
|
||||||
|
|
||||||
// Scanline 1
|
// Scanline 1
|
||||||
if (toY.u0 != u0)
|
if (toY.u0 != u0)
|
||||||
@ -1360,7 +1361,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t x = 0; x < nwidth; ++x)
|
for (size_t x = 0; x < nwidth; ++x)
|
||||||
{
|
{
|
||||||
const auto& toX = cfX[x];
|
auto const& toX = cfX[x];
|
||||||
|
|
||||||
XMVECTOR C0, C1, C2, C3;
|
XMVECTOR C0, C1, C2, C3;
|
||||||
|
|
||||||
@ -1614,9 +1615,6 @@ namespace
|
|||||||
if (!baseImages || !depth)
|
if (!baseImages || !depth)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
if (depth > INT16_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
assert(levels > 1);
|
assert(levels > 1);
|
||||||
|
|
||||||
const size_t width = baseImages[0].width;
|
const size_t width = baseImages[0].width;
|
||||||
@ -1668,9 +1666,6 @@ namespace
|
|||||||
if (!depth || !mipChain.GetImages())
|
if (!depth || !mipChain.GetImages())
|
||||||
return E_INVALIDARG;
|
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)
|
// This assumes that the base images are already placed into the mipChain at the top level... (see _Setup3DMips)
|
||||||
|
|
||||||
assert(levels > 1);
|
assert(levels > 1);
|
||||||
@ -1819,9 +1814,6 @@ namespace
|
|||||||
if (!depth || !mipChain.GetImages())
|
if (!depth || !mipChain.GetImages())
|
||||||
return E_INVALIDARG;
|
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)
|
// This assumes that the base images are already placed into the mipChain at the top level... (see _Setup3DMips)
|
||||||
|
|
||||||
assert(levels > 1);
|
assert(levels > 1);
|
||||||
@ -1996,9 +1988,6 @@ namespace
|
|||||||
if (!depth || !mipChain.GetImages())
|
if (!depth || !mipChain.GetImages())
|
||||||
return E_INVALIDARG;
|
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)
|
// This assumes that the base images are already placed into the mipChain at the top level... (see _Setup3DMips)
|
||||||
|
|
||||||
assert(levels > 1);
|
assert(levels > 1);
|
||||||
@ -2050,7 +2039,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t slice = 0; slice < ndepth; ++slice)
|
for (size_t slice = 0; slice < ndepth; ++slice)
|
||||||
{
|
{
|
||||||
const auto& toZ = lfZ[slice];
|
auto const& toZ = lfZ[slice];
|
||||||
|
|
||||||
const Image* srca = mipChain.GetImage(level - 1, 0, toZ.u0);
|
const Image* srca = mipChain.GetImage(level - 1, 0, toZ.u0);
|
||||||
const Image* srcb = mipChain.GetImage(level - 1, 0, toZ.u1);
|
const Image* srcb = mipChain.GetImage(level - 1, 0, toZ.u1);
|
||||||
@ -2068,7 +2057,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t y = 0; y < nheight; ++y)
|
for (size_t y = 0; y < nheight; ++y)
|
||||||
{
|
{
|
||||||
const auto& toY = lfY[y];
|
auto const& toY = lfY[y];
|
||||||
|
|
||||||
if (toY.u0 != u0)
|
if (toY.u0 != u0)
|
||||||
{
|
{
|
||||||
@ -2101,7 +2090,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t x = 0; x < nwidth; ++x)
|
for (size_t x = 0; x < nwidth; ++x)
|
||||||
{
|
{
|
||||||
const auto& toX = lfX[x];
|
auto const& toX = lfX[x];
|
||||||
|
|
||||||
TRILINEAR_INTERPOLATE(target[x], toX, toY, toZ, urow0, urow1, vrow0, vrow1)
|
TRILINEAR_INTERPOLATE(target[x], toX, toY, toZ, urow0, urow1, vrow0, vrow1)
|
||||||
}
|
}
|
||||||
@ -2131,7 +2120,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t y = 0; y < nheight; ++y)
|
for (size_t y = 0; y < nheight; ++y)
|
||||||
{
|
{
|
||||||
const auto& toY = lfY[y];
|
auto const& toY = lfY[y];
|
||||||
|
|
||||||
if (toY.u0 != u0)
|
if (toY.u0 != u0)
|
||||||
{
|
{
|
||||||
@ -2161,7 +2150,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t x = 0; x < nwidth; ++x)
|
for (size_t x = 0; x < nwidth; ++x)
|
||||||
{
|
{
|
||||||
const auto& toX = lfX[x];
|
auto const& toX = lfX[x];
|
||||||
|
|
||||||
BILINEAR_INTERPOLATE(target[x], toX, toY, urow0, urow1)
|
BILINEAR_INTERPOLATE(target[x], toX, toY, urow0, urow1)
|
||||||
}
|
}
|
||||||
@ -2194,9 +2183,6 @@ namespace
|
|||||||
if (!depth || !mipChain.GetImages())
|
if (!depth || !mipChain.GetImages())
|
||||||
return E_INVALIDARG;
|
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)
|
// This assumes that the base images are already placed into the mipChain at the top level... (see _Setup3DMips)
|
||||||
|
|
||||||
assert(levels > 1);
|
assert(levels > 1);
|
||||||
@ -2260,7 +2246,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t slice = 0; slice < ndepth; ++slice)
|
for (size_t slice = 0; slice < ndepth; ++slice)
|
||||||
{
|
{
|
||||||
const auto& toZ = cfZ[slice];
|
auto const& toZ = cfZ[slice];
|
||||||
|
|
||||||
const Image* srca = mipChain.GetImage(level - 1, 0, toZ.u0);
|
const Image* srca = mipChain.GetImage(level - 1, 0, toZ.u0);
|
||||||
const Image* srcb = mipChain.GetImage(level - 1, 0, toZ.u1);
|
const Image* srcb = mipChain.GetImage(level - 1, 0, toZ.u1);
|
||||||
@ -2282,7 +2268,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t y = 0; y < nheight; ++y)
|
for (size_t y = 0; y < nheight; ++y)
|
||||||
{
|
{
|
||||||
const auto& toY = cfY[y];
|
auto const& toY = cfY[y];
|
||||||
|
|
||||||
// Scanline 1
|
// Scanline 1
|
||||||
if (toY.u0 != u0)
|
if (toY.u0 != u0)
|
||||||
@ -2403,7 +2389,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t x = 0; x < nwidth; ++x)
|
for (size_t x = 0; x < nwidth; ++x)
|
||||||
{
|
{
|
||||||
const auto& toX = cfX[x];
|
auto const& toX = cfX[x];
|
||||||
|
|
||||||
XMVECTOR D[4];
|
XMVECTOR D[4];
|
||||||
|
|
||||||
@ -2448,7 +2434,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t y = 0; y < nheight; ++y)
|
for (size_t y = 0; y < nheight; ++y)
|
||||||
{
|
{
|
||||||
const auto& toY = cfY[y];
|
auto const& toY = cfY[y];
|
||||||
|
|
||||||
// Scanline 1
|
// Scanline 1
|
||||||
if (toY.u0 != u0)
|
if (toY.u0 != u0)
|
||||||
@ -2539,7 +2525,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t x = 0; x < nwidth; ++x)
|
for (size_t x = 0; x < nwidth; ++x)
|
||||||
{
|
{
|
||||||
const auto& toX = cfX[x];
|
auto const& toX = cfX[x];
|
||||||
|
|
||||||
XMVECTOR C0, C1, C2, C3;
|
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]);
|
CUBIC_INTERPOLATE(C0, toX.x, urow[0][toX.u0], urow[0][toX.u1], urow[0][toX.u2], urow[0][toX.u3]);
|
||||||
@ -2578,9 +2564,6 @@ namespace
|
|||||||
if (!depth || !mipChain.GetImages())
|
if (!depth || !mipChain.GetImages())
|
||||||
return E_INVALIDARG;
|
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)
|
// This assumes that the base images are already placed into the mipChain at the top level... (see _Setup3DMips)
|
||||||
|
|
||||||
assert(levels > 1);
|
assert(levels > 1);
|
||||||
@ -2951,7 +2934,7 @@ HRESULT DirectX::GenerateMipMaps(
|
|||||||
mdata.mipLevels = levels;
|
mdata.mipLevels = levels;
|
||||||
mdata.format = baseImage.format;
|
mdata.format = baseImage.format;
|
||||||
|
|
||||||
uint32_t filter_select = (filter & TEX_FILTER_MODE_MASK);
|
unsigned long filter_select = (filter & TEX_FILTER_MODE_MASK);
|
||||||
if (!filter_select)
|
if (!filter_select)
|
||||||
{
|
{
|
||||||
// Default filter choice
|
// Default filter choice
|
||||||
@ -3166,7 +3149,7 @@ HRESULT DirectX::GenerateMipMaps(
|
|||||||
TexMetadata mdata2 = metadata;
|
TexMetadata mdata2 = metadata;
|
||||||
mdata2.mipLevels = levels;
|
mdata2.mipLevels = levels;
|
||||||
|
|
||||||
uint32_t filter_select = (filter & TEX_FILTER_MODE_MASK);
|
unsigned long filter_select = (filter & TEX_FILTER_MODE_MASK);
|
||||||
if (!filter_select)
|
if (!filter_select)
|
||||||
{
|
{
|
||||||
// Default filter choice
|
// Default filter choice
|
||||||
@ -3261,9 +3244,6 @@ HRESULT DirectX::GenerateMipMaps3D(
|
|||||||
if (!baseImages || !depth)
|
if (!baseImages || !depth)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
if (depth > INT16_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
if (filter & TEX_FILTER_FORCE_WIC)
|
if (filter & TEX_FILTER_FORCE_WIC)
|
||||||
return HRESULT_E_NOT_SUPPORTED;
|
return HRESULT_E_NOT_SUPPORTED;
|
||||||
|
|
||||||
@ -3296,7 +3276,7 @@ HRESULT DirectX::GenerateMipMaps3D(
|
|||||||
|
|
||||||
HRESULT hr = E_UNEXPECTED;
|
HRESULT hr = E_UNEXPECTED;
|
||||||
|
|
||||||
uint32_t filter_select = (filter & TEX_FILTER_MODE_MASK);
|
unsigned long filter_select = (filter & TEX_FILTER_MODE_MASK);
|
||||||
if (!filter_select)
|
if (!filter_select)
|
||||||
{
|
{
|
||||||
// Default filter choice
|
// Default filter choice
|
||||||
@ -3372,9 +3352,6 @@ HRESULT DirectX::GenerateMipMaps3D(
|
|||||||
if (!srcImages || !nimages || !IsValid(metadata.format))
|
if (!srcImages || !nimages || !IsValid(metadata.format))
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
if (levels > INT16_MAX)
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
if (filter & TEX_FILTER_FORCE_WIC)
|
if (filter & TEX_FILTER_FORCE_WIC)
|
||||||
return HRESULT_E_NOT_SUPPORTED;
|
return HRESULT_E_NOT_SUPPORTED;
|
||||||
|
|
||||||
@ -3415,7 +3392,7 @@ HRESULT DirectX::GenerateMipMaps3D(
|
|||||||
|
|
||||||
static_assert(TEX_FILTER_POINT == 0x100000, "TEX_FILTER_ flag values don't match TEX_FILTER_MODE_MASK");
|
static_assert(TEX_FILTER_POINT == 0x100000, "TEX_FILTER_ flag values don't match TEX_FILTER_MODE_MASK");
|
||||||
|
|
||||||
uint32_t filter_select = (filter & TEX_FILTER_MODE_MASK);
|
unsigned long filter_select = (filter & TEX_FILTER_MODE_MASK);
|
||||||
if (!filter_select)
|
if (!filter_select)
|
||||||
{
|
{
|
||||||
// Default filter choice
|
// Default filter choice
|
||||||
|
|||||||
@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
// Off by default warnings
|
// Off by default warnings
|
||||||
#pragma warning(disable : 4619 4616 4061 4265 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039 5045 5219 5246 5264 26812)
|
#pragma warning(disable : 4619 4616 4061 4265 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039 5045 5219 5246 5264 26812)
|
||||||
// C4619/4616 #pragma warning warnings
|
// C4619/4616 #pragma warning warnings
|
||||||
@ -40,24 +39,16 @@
|
|||||||
// C5264 'const' variable is not used
|
// C5264 'const' variable is not used
|
||||||
// 26812: The enum type 'x' is unscoped. Prefer 'enum class' over 'enum' (Enum.3).
|
// 26812: The enum type 'x' is unscoped. Prefer 'enum class' over 'enum' (Enum.3).
|
||||||
|
|
||||||
#if defined(_XBOX_ONE) && defined(_TITLE)
|
// Windows 8.1 SDK related Off by default warnings
|
||||||
// Xbox One XDK related Off by default warnings
|
#pragma warning(disable : 4471 4917 4986 5029)
|
||||||
#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
|
// 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
|
// C4917 a GUID can only be associated with a class, interface or namespace
|
||||||
// C4986 exception specification does not match previous declaration
|
// C4986 exception specification does not match previous declaration
|
||||||
// C5029 nonstandard extension used
|
// C5029 nonstandard extension used
|
||||||
// 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)
|
// Xbox One XDK related Off by default warnings
|
||||||
// C5043 exception specification does not match previous declaration
|
#pragma warning(disable : 4643)
|
||||||
// C5204 class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly
|
// C4643 Forward declaring in namespace std is not permitted by the C++ Standard
|
||||||
// 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
|
#ifdef __INTEL_COMPILER
|
||||||
#pragma warning(disable : 161)
|
#pragma warning(disable : 161)
|
||||||
@ -80,8 +71,6 @@
|
|||||||
#pragma clang diagnostic ignored "-Wtautological-type-limit-compare"
|
#pragma clang diagnostic ignored "-Wtautological-type-limit-compare"
|
||||||
#pragma clang diagnostic ignored "-Wunknown-pragmas"
|
#pragma clang diagnostic ignored "-Wunknown-pragmas"
|
||||||
#pragma clang diagnostic ignored "-Wundef"
|
#pragma clang diagnostic ignored "-Wundef"
|
||||||
#pragma clang diagnostic ignored "-Wunknown-warning-option"
|
|
||||||
#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
@ -132,7 +121,7 @@
|
|||||||
#endif
|
#endif
|
||||||
#include <d3d11_4.h>
|
#include <d3d11_4.h>
|
||||||
#else
|
#else
|
||||||
#include <d3d11_2.h>
|
#include <d3d11_1.h>
|
||||||
#endif
|
#endif
|
||||||
#else // !WIN32
|
#else // !WIN32
|
||||||
#include <wsl/winadapter.h>
|
#include <wsl/winadapter.h>
|
||||||
@ -142,7 +131,6 @@
|
|||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cctype>
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
@ -205,9 +193,6 @@ using WICPixelFormatGUID = GUID;
|
|||||||
#define E_BOUNDS static_cast<HRESULT>(0x8000000BL)
|
#define E_BOUNDS static_cast<HRESULT>(0x8000000BL)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)
|
|
||||||
#define HRESULT_ERROR_FILE_NOT_FOUND static_cast<HRESULT>(0x80070002)
|
|
||||||
|
|
||||||
// HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW)
|
// HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW)
|
||||||
#define HRESULT_E_ARITHMETIC_OVERFLOW static_cast<HRESULT>(0x80070216L)
|
#define HRESULT_E_ARITHMETIC_OVERFLOW static_cast<HRESULT>(0x80070216L)
|
||||||
|
|
||||||
|
|||||||
@ -414,7 +414,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t y = 0; y < destImage.height; ++y)
|
for (size_t y = 0; y < destImage.height; ++y)
|
||||||
{
|
{
|
||||||
const auto& toY = lfY[y];
|
auto const& toY = lfY[y];
|
||||||
|
|
||||||
if (toY.u0 != u0)
|
if (toY.u0 != u0)
|
||||||
{
|
{
|
||||||
@ -444,7 +444,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t x = 0; x < destImage.width; ++x)
|
for (size_t x = 0; x < destImage.width; ++x)
|
||||||
{
|
{
|
||||||
const auto& toX = lfX[x];
|
auto const& toX = lfX[x];
|
||||||
|
|
||||||
BILINEAR_INTERPOLATE(target[x], toX, toY, row0, row1)
|
BILINEAR_INTERPOLATE(target[x], toX, toY, row0, row1)
|
||||||
}
|
}
|
||||||
@ -511,7 +511,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t y = 0; y < destImage.height; ++y)
|
for (size_t y = 0; y < destImage.height; ++y)
|
||||||
{
|
{
|
||||||
const auto& toY = cfY[y];
|
auto const& toY = cfY[y];
|
||||||
|
|
||||||
// Scanline 1
|
// Scanline 1
|
||||||
if (toY.u0 != u0)
|
if (toY.u0 != u0)
|
||||||
@ -602,7 +602,7 @@ namespace
|
|||||||
|
|
||||||
for (size_t x = 0; x < destImage.width; ++x)
|
for (size_t x = 0; x < destImage.width; ++x)
|
||||||
{
|
{
|
||||||
const auto& toX = cfX[x];
|
auto const& toX = cfX[x];
|
||||||
|
|
||||||
XMVECTOR C0, C1, C2, C3;
|
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");
|
static_assert(TEX_FILTER_POINT == 0x100000, "TEX_FILTER_ flag values don't match TEX_FILTER_MASK");
|
||||||
|
|
||||||
uint32_t filter_select = filter & TEX_FILTER_MODE_MASK;
|
unsigned long filter_select = filter & TEX_FILTER_MODE_MASK;
|
||||||
if (!filter_select)
|
if (!filter_select)
|
||||||
{
|
{
|
||||||
// Default filter choice
|
// Default filter choice
|
||||||
|
|||||||
@ -139,7 +139,7 @@ namespace
|
|||||||
// Decodes TGA header
|
// Decodes TGA header
|
||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
HRESULT DecodeTGAHeader(
|
HRESULT DecodeTGAHeader(
|
||||||
_In_reads_bytes_(size) const uint8_t* pSource,
|
_In_reads_bytes_(size) const void* pSource,
|
||||||
size_t size,
|
size_t size,
|
||||||
TGA_FLAGS flags,
|
TGA_FLAGS flags,
|
||||||
_Out_ TexMetadata& metadata,
|
_Out_ TexMetadata& metadata,
|
||||||
@ -156,7 +156,7 @@ namespace
|
|||||||
return HRESULT_E_INVALID_DATA;
|
return HRESULT_E_INVALID_DATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto pHeader = reinterpret_cast<const TGA_HEADER*>(pSource);
|
auto pHeader = static_cast<const TGA_HEADER*>(pSource);
|
||||||
|
|
||||||
if (pHeader->bDescriptor & (TGA_FLAGS_INTERLEAVED_2WAY | TGA_FLAGS_INTERLEAVED_4WAY))
|
if (pHeader->bDescriptor & (TGA_FLAGS_INTERLEAVED_2WAY | TGA_FLAGS_INTERLEAVED_4WAY))
|
||||||
{
|
{
|
||||||
@ -280,12 +280,6 @@ namespace
|
|||||||
return HRESULT_E_INVALID_DATA;
|
return HRESULT_E_INVALID_DATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t sizeBytes = uint64_t(pHeader->wWidth) * uint64_t(pHeader->wHeight) * uint64_t(pHeader->bBitsPerPixel) / 8;
|
|
||||||
if (sizeBytes > UINT32_MAX)
|
|
||||||
{
|
|
||||||
return HRESULT_E_ARITHMETIC_OVERFLOW;
|
|
||||||
}
|
|
||||||
|
|
||||||
metadata.width = pHeader->wWidth;
|
metadata.width = pHeader->wWidth;
|
||||||
metadata.height = pHeader->wHeight;
|
metadata.height = pHeader->wHeight;
|
||||||
metadata.depth = metadata.arraySize = metadata.mipLevels = 1;
|
metadata.depth = metadata.arraySize = metadata.mipLevels = 1;
|
||||||
@ -1344,7 +1338,6 @@ namespace
|
|||||||
|
|
||||||
switch (metadata.GetAlphaMode())
|
switch (metadata.GetAlphaMode())
|
||||||
{
|
{
|
||||||
default:
|
|
||||||
case TEX_ALPHA_MODE_UNKNOWN:
|
case TEX_ALPHA_MODE_UNKNOWN:
|
||||||
ext->bAttributesType = HasAlpha(metadata.format) ? TGA_ATTRIBUTE_UNDEFINED : TGA_ATTRIBUTE_NONE;
|
ext->bAttributesType = HasAlpha(metadata.format) ? TGA_ATTRIBUTE_UNDEFINED : TGA_ATTRIBUTE_NONE;
|
||||||
break;
|
break;
|
||||||
@ -1400,7 +1393,6 @@ namespace
|
|||||||
case TGA_ATTRIBUTE_UNDEFINED: return TEX_ALPHA_MODE_CUSTOM;
|
case TGA_ATTRIBUTE_UNDEFINED: return TEX_ALPHA_MODE_CUSTOM;
|
||||||
case TGA_ATTRIBUTE_ALPHA: return TEX_ALPHA_MODE_STRAIGHT;
|
case TGA_ATTRIBUTE_ALPHA: return TEX_ALPHA_MODE_STRAIGHT;
|
||||||
case TGA_ATTRIBUTE_PREMULTIPLIED: return TEX_ALPHA_MODE_PREMULTIPLIED;
|
case TGA_ATTRIBUTE_PREMULTIPLIED: return TEX_ALPHA_MODE_PREMULTIPLIED;
|
||||||
default: return TEX_ALPHA_MODE_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1413,7 +1405,7 @@ namespace
|
|||||||
|
|
||||||
if (ext && ext->wSize == sizeof(TGA_EXTENSION) && ext->wGammaDenominator != 0)
|
if (ext && ext->wSize == sizeof(TGA_EXTENSION) && ext->wGammaDenominator != 0)
|
||||||
{
|
{
|
||||||
const auto gamma = static_cast<float>(ext->wGammaNumerator) / static_cast<float>(ext->wGammaDenominator);
|
auto const gamma = static_cast<float>(ext->wGammaNumerator) / static_cast<float>(ext->wGammaDenominator);
|
||||||
if (fabsf(gamma - 2.2f) < GAMMA_EPSILON || fabsf(gamma - 2.4f) < GAMMA_EPSILON)
|
if (fabsf(gamma - 2.2f) < GAMMA_EPSILON || fabsf(gamma - 2.4f) < GAMMA_EPSILON)
|
||||||
{
|
{
|
||||||
sRGB = true;
|
sRGB = true;
|
||||||
@ -1447,7 +1439,7 @@ namespace
|
|||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
HRESULT DirectX::GetMetadataFromTGAMemory(
|
HRESULT DirectX::GetMetadataFromTGAMemory(
|
||||||
const uint8_t* pSource,
|
const void* pSource,
|
||||||
size_t size,
|
size_t size,
|
||||||
TGA_FLAGS flags,
|
TGA_FLAGS flags,
|
||||||
TexMetadata& metadata) noexcept
|
TexMetadata& metadata) noexcept
|
||||||
@ -1492,10 +1484,12 @@ HRESULT DirectX::GetMetadataFromTGAFile(const wchar_t* szFile, TGA_FLAGS flags,
|
|||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
szFile,
|
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
|
||||||
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
#else
|
||||||
nullptr)));
|
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
|
||||||
|
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
|
||||||
|
#endif
|
||||||
if (!hFile)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -1550,7 +1544,7 @@ HRESULT DirectX::GetMetadataFromTGAFile(const wchar_t* szFile, TGA_FLAGS flags,
|
|||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto headerLen = static_cast<size_t>(bytesRead);
|
auto const headerLen = static_cast<size_t>(bytesRead);
|
||||||
#else
|
#else
|
||||||
inFile.read(reinterpret_cast<char*>(header), TGA_HEADER_LEN);
|
inFile.read(reinterpret_cast<char*>(header), TGA_HEADER_LEN);
|
||||||
if (!inFile)
|
if (!inFile)
|
||||||
@ -1639,7 +1633,7 @@ HRESULT DirectX::GetMetadataFromTGAFile(const wchar_t* szFile, TGA_FLAGS flags,
|
|||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
HRESULT DirectX::LoadFromTGAMemory(
|
HRESULT DirectX::LoadFromTGAMemory(
|
||||||
const uint8_t* pSource,
|
const void* pSource,
|
||||||
size_t size,
|
size_t size,
|
||||||
TGA_FLAGS flags,
|
TGA_FLAGS flags,
|
||||||
TexMetadata* metadata,
|
TexMetadata* metadata,
|
||||||
@ -1658,7 +1652,7 @@ HRESULT DirectX::LoadFromTGAMemory(
|
|||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
if (offset > size)
|
if (offset > size)
|
||||||
return HRESULT_E_INVALID_DATA;
|
return E_FAIL;
|
||||||
|
|
||||||
size_t paletteOffset = 0;
|
size_t paletteOffset = 0;
|
||||||
uint8_t palette[256 * 4] = {};
|
uint8_t palette[256 * 4] = {};
|
||||||
@ -1679,11 +1673,11 @@ HRESULT DirectX::LoadFromTGAMemory(
|
|||||||
|
|
||||||
const size_t remaining = size - offset - paletteOffset;
|
const size_t remaining = size - offset - paletteOffset;
|
||||||
if (remaining == 0)
|
if (remaining == 0)
|
||||||
return HRESULT_E_HANDLE_EOF;
|
return E_FAIL;
|
||||||
|
|
||||||
const void* pPixels = static_cast<const uint8_t*>(pSource) + offset + paletteOffset;
|
const void* pPixels = static_cast<const uint8_t*>(pSource) + offset + paletteOffset;
|
||||||
|
|
||||||
hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1, CP_FLAGS_LIMIT_4GB);
|
hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
@ -1756,10 +1750,12 @@ HRESULT DirectX::LoadFromTGAFile(
|
|||||||
image.Release();
|
image.Release();
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
szFile,
|
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr)));
|
||||||
GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING,
|
#else
|
||||||
nullptr)));
|
ScopedHandle hFile(safe_handle(CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING,
|
||||||
|
FILE_FLAG_SEQUENTIAL_SCAN, nullptr)));
|
||||||
|
#endif
|
||||||
if (!hFile)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -1814,7 +1810,7 @@ HRESULT DirectX::LoadFromTGAFile(
|
|||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto headerLen = static_cast<size_t>(bytesRead);
|
auto const headerLen = static_cast<size_t>(bytesRead);
|
||||||
#else
|
#else
|
||||||
inFile.read(reinterpret_cast<char*>(header), TGA_HEADER_LEN);
|
inFile.read(reinterpret_cast<char*>(header), TGA_HEADER_LEN);
|
||||||
if (!inFile)
|
if (!inFile)
|
||||||
@ -1830,11 +1826,8 @@ HRESULT DirectX::LoadFromTGAFile(
|
|||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
if (offset > len)
|
|
||||||
return HRESULT_E_INVALID_DATA;
|
|
||||||
|
|
||||||
// Read the pixels
|
// Read the pixels
|
||||||
const auto remaining = len - offset;
|
auto const remaining = len - offset;
|
||||||
if (remaining == 0)
|
if (remaining == 0)
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
||||||
@ -1854,7 +1847,7 @@ HRESULT DirectX::LoadFromTGAFile(
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1, CP_FLAGS_LIMIT_4GB);
|
hr = image.Initialize2D(mdata.format, mdata.width, mdata.height, 1, 1);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
@ -2127,12 +2120,6 @@ HRESULT DirectX::LoadFromTGAFile(
|
|||||||
image.Release();
|
image.Release();
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((remaining - paletteOffset) == 0)
|
|
||||||
{
|
|
||||||
image.Release();
|
|
||||||
return HRESULT_E_HANDLE_EOF;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (convFlags & CONV_FLAGS_RLE)
|
if (convFlags & CONV_FLAGS_RLE)
|
||||||
@ -2281,7 +2268,7 @@ HRESULT DirectX::SaveToTGAMemory(
|
|||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
// Copy header
|
// Copy header
|
||||||
auto destPtr = blob.GetBufferPointer();
|
auto destPtr = static_cast<uint8_t*>(blob.GetBufferPointer());
|
||||||
assert(destPtr != nullptr);
|
assert(destPtr != nullptr);
|
||||||
|
|
||||||
uint8_t* dPtr = destPtr;
|
uint8_t* dPtr = destPtr;
|
||||||
@ -2359,10 +2346,13 @@ HRESULT DirectX::SaveToTGAFile(
|
|||||||
|
|
||||||
// Create file and write header
|
// Create file and write header
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
ScopedHandle hFile(safe_handle(CreateFile2(
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
|
||||||
szFile,
|
ScopedHandle hFile(safe_handle(CreateFile2(szFile, GENERIC_WRITE, 0,
|
||||||
GENERIC_WRITE, 0, CREATE_ALWAYS,
|
CREATE_ALWAYS, nullptr)));
|
||||||
nullptr)));
|
#else
|
||||||
|
ScopedHandle hFile(safe_handle(CreateFileW(szFile,
|
||||||
|
GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr)));
|
||||||
|
#endif
|
||||||
if (!hFile)
|
if (!hFile)
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
@ -2395,7 +2385,7 @@ HRESULT DirectX::SaveToTGAFile(
|
|||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
const DWORD bytesToWrite = static_cast<DWORD>(blob.GetBufferSize());
|
const DWORD bytesToWrite = static_cast<DWORD>(blob.GetBufferSize());
|
||||||
DWORD bytesWritten;
|
DWORD bytesWritten;
|
||||||
if (!WriteFile(hFile.get(), blob.GetConstBufferPointer(), bytesToWrite, &bytesWritten, nullptr))
|
if (!WriteFile(hFile.get(), blob.GetBufferPointer(), bytesToWrite, &bytesWritten, nullptr))
|
||||||
{
|
{
|
||||||
return HRESULT_FROM_WIN32(GetLastError());
|
return HRESULT_FROM_WIN32(GetLastError());
|
||||||
}
|
}
|
||||||
@ -2405,7 +2395,7 @@ HRESULT DirectX::SaveToTGAFile(
|
|||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
outFile.write(reinterpret_cast<const char*>(blob.GetConstBufferPointer()),
|
outFile.write(reinterpret_cast<char*>(blob.GetBufferPointer()),
|
||||||
static_cast<std::streamsize>(blob.GetBufferSize()));
|
static_cast<std::streamsize>(blob.GetBufferSize()));
|
||||||
|
|
||||||
if (!outFile)
|
if (!outFile)
|
||||||
@ -2532,39 +2522,3 @@ HRESULT DirectX::SaveToTGAFile(
|
|||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// Adapters for /Zc:wchar_t- clients
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
|
|
||||||
|
|
||||||
namespace DirectX
|
|
||||||
{
|
|
||||||
HRESULT __cdecl GetMetadataFromTGAFile(
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_In_ TGA_FLAGS flags,
|
|
||||||
_Out_ TexMetadata& metadata) noexcept
|
|
||||||
{
|
|
||||||
return GetMetadataFromTGAFile(reinterpret_cast<const unsigned short*>(szFile), flags, metadata);
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT __cdecl LoadFromTGAFile(
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_In_ TGA_FLAGS flags,
|
|
||||||
_Out_opt_ TexMetadata* metadata,
|
|
||||||
_Out_ ScratchImage& image) noexcept
|
|
||||||
{
|
|
||||||
return LoadFromTGAFile(reinterpret_cast<const unsigned short*>(szFile), flags, metadata, image);
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT __cdecl SaveToTGAFile(_In_ const Image& image,
|
|
||||||
_In_ TGA_FLAGS flags,
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_In_opt_ const TexMetadata* metadata) noexcept
|
|
||||||
{
|
|
||||||
return SaveToTGAFile(image, flags, reinterpret_cast<const unsigned short*>(szFile), metadata);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // !_NATIVE_WCHAR_T_DEFINED
|
|
||||||
|
|||||||
@ -27,10 +27,6 @@ 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");
|
static_assert(WIN10_DXGI_FORMAT_V408 == DXGI_FORMAT_V408, "Windows SDK mismatch detected");
|
||||||
#endif
|
#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 namespace DirectX;
|
||||||
using Microsoft::WRL::ComPtr;
|
using Microsoft::WRL::ComPtr;
|
||||||
|
|
||||||
@ -45,12 +41,6 @@ namespace
|
|||||||
const GUID& wic;
|
const GUID& wic;
|
||||||
DXGI_FORMAT format;
|
DXGI_FORMAT format;
|
||||||
bool srgb;
|
bool srgb;
|
||||||
|
|
||||||
constexpr WICTranslate(const GUID& wg, DXGI_FORMAT fmt, bool isrgb) noexcept :
|
|
||||||
wic(wg),
|
|
||||||
format(fmt),
|
|
||||||
srgb(isrgb)
|
|
||||||
{}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr WICTranslate g_WICFormats[] =
|
constexpr WICTranslate g_WICFormats[] =
|
||||||
@ -85,6 +75,7 @@ namespace
|
|||||||
|
|
||||||
BOOL WINAPI InitializeWICFactory(PINIT_ONCE, PVOID, PVOID *ifactory) noexcept
|
BOOL WINAPI InitializeWICFactory(PINIT_ONCE, PVOID, PVOID *ifactory) noexcept
|
||||||
{
|
{
|
||||||
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
|
||||||
HRESULT hr = CoCreateInstance(
|
HRESULT hr = CoCreateInstance(
|
||||||
CLSID_WICImagingFactory2,
|
CLSID_WICImagingFactory2,
|
||||||
nullptr,
|
nullptr,
|
||||||
@ -112,6 +103,16 @@ namespace
|
|||||||
);
|
);
|
||||||
return SUCCEEDED(hr) ? TRUE : FALSE;
|
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
|
#else // !WIN32
|
||||||
@ -140,11 +141,13 @@ DXGI_FORMAT DirectX::Internal::WICToDXGI(const GUID& guid) noexcept
|
|||||||
return g_WICFormats[i].format;
|
return g_WICFormats[i].format;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
|
||||||
if (g_WIC2)
|
if (g_WIC2)
|
||||||
{
|
{
|
||||||
if (memcmp(&GUID_WICPixelFormat96bppRGBFloat, &guid, sizeof(GUID)) == 0)
|
if (memcmp(&GUID_WICPixelFormat96bppRGBFloat, &guid, sizeof(GUID)) == 0)
|
||||||
return DXGI_FORMAT_R32G32B32_FLOAT;
|
return DXGI_FORMAT_R32G32B32_FLOAT;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
return DXGI_FORMAT_UNKNOWN;
|
return DXGI_FORMAT_UNKNOWN;
|
||||||
}
|
}
|
||||||
@ -184,6 +187,7 @@ bool DirectX::Internal::DXGIToWIC(DXGI_FORMAT format, GUID& guid, bool ignoreRGB
|
|||||||
memcpy(&guid, &GUID_WICPixelFormat32bppBGR, sizeof(GUID));
|
memcpy(&guid, &GUID_WICPixelFormat32bppBGR, sizeof(GUID));
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
|
||||||
case DXGI_FORMAT_R32G32B32_FLOAT:
|
case DXGI_FORMAT_R32G32B32_FLOAT:
|
||||||
if (g_WIC2)
|
if (g_WIC2)
|
||||||
{
|
{
|
||||||
@ -191,6 +195,7 @@ bool DirectX::Internal::DXGIToWIC(DXGI_FORMAT format, GUID& guid, bool ignoreRGB
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
|
||||||
default:
|
default:
|
||||||
for (size_t i = 0; i < std::size(g_WICFormats); ++i)
|
for (size_t i = 0; i < std::size(g_WICFormats); ++i)
|
||||||
@ -314,12 +319,14 @@ void DirectX::SetWICFactory(_In_opt_ IWICImagingFactory* pWIC) noexcept
|
|||||||
bool iswic2 = false;
|
bool iswic2 = false;
|
||||||
if (pWIC)
|
if (pWIC)
|
||||||
{
|
{
|
||||||
|
#if(_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
|
||||||
ComPtr<IWICImagingFactory2> wic2;
|
ComPtr<IWICImagingFactory2> wic2;
|
||||||
HRESULT hr = pWIC->QueryInterface(IID_PPV_ARGS(wic2.GetAddressOf()));
|
HRESULT hr = pWIC->QueryInterface(IID_PPV_ARGS(wic2.GetAddressOf()));
|
||||||
if (SUCCEEDED(hr))
|
if (SUCCEEDED(hr))
|
||||||
{
|
{
|
||||||
iswic2 = true;
|
iswic2 = true;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
pWIC->AddRef();
|
pWIC->AddRef();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -393,20 +400,10 @@ bool DirectX::IsVideo(DXGI_FORMAT fmt) noexcept
|
|||||||
|
|
||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
bool DirectX::IsPlanar(DXGI_FORMAT fmt, bool isd3d12) noexcept
|
bool DirectX::IsPlanar(DXGI_FORMAT fmt) noexcept
|
||||||
{
|
{
|
||||||
switch (static_cast<int>(fmt))
|
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_NV12: // 4:2:0 8-bit
|
||||||
case DXGI_FORMAT_P010: // 4:2:0 10-bit
|
case DXGI_FORMAT_P010: // 4:2:0 10-bit
|
||||||
case DXGI_FORMAT_P016: // 4:2:0 16-bit
|
case DXGI_FORMAT_P016: // 4:2:0 16-bit
|
||||||
@ -914,45 +911,6 @@ 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)
|
// Computes the image row pitch in bytes, and the slice ptich (size in bytes of the image)
|
||||||
// based on DXGI format, width, and height
|
// based on DXGI format, width, and height
|
||||||
@ -966,9 +924,6 @@ HRESULT DirectX::ComputePitch(DXGI_FORMAT fmt, size_t width, size_t height,
|
|||||||
|
|
||||||
switch (static_cast<int>(fmt))
|
switch (static_cast<int>(fmt))
|
||||||
{
|
{
|
||||||
case DXGI_FORMAT_UNKNOWN:
|
|
||||||
return E_INVALIDARG;
|
|
||||||
|
|
||||||
case DXGI_FORMAT_BC1_TYPELESS:
|
case DXGI_FORMAT_BC1_TYPELESS:
|
||||||
case DXGI_FORMAT_BC1_UNORM:
|
case DXGI_FORMAT_BC1_UNORM:
|
||||||
case DXGI_FORMAT_BC1_UNORM_SRGB:
|
case DXGI_FORMAT_BC1_UNORM_SRGB:
|
||||||
@ -1189,9 +1144,6 @@ size_t DirectX::ComputeScanlines(DXGI_FORMAT fmt, size_t height) noexcept
|
|||||||
{
|
{
|
||||||
switch (static_cast<int>(fmt))
|
switch (static_cast<int>(fmt))
|
||||||
{
|
{
|
||||||
case DXGI_FORMAT_UNKNOWN:
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
case DXGI_FORMAT_BC1_TYPELESS:
|
case DXGI_FORMAT_BC1_TYPELESS:
|
||||||
case DXGI_FORMAT_BC1_UNORM:
|
case DXGI_FORMAT_BC1_UNORM:
|
||||||
case DXGI_FORMAT_BC1_UNORM_SRGB:
|
case DXGI_FORMAT_BC1_UNORM_SRGB:
|
||||||
@ -1247,163 +1199,6 @@ 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
|
// Converts to an SRGB equivalent type if available
|
||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
@ -1692,6 +1487,7 @@ DXGI_FORMAT DirectX::MakeTypelessFLOAT(DXGI_FORMAT fmt) noexcept
|
|||||||
// TexMetadata
|
// TexMetadata
|
||||||
//=====================================================================================
|
//=====================================================================================
|
||||||
|
|
||||||
|
_Use_decl_annotations_
|
||||||
size_t TexMetadata::ComputeIndex(size_t mip, size_t item, size_t slice) const noexcept
|
size_t TexMetadata::ComputeIndex(size_t mip, size_t item, size_t slice) const noexcept
|
||||||
{
|
{
|
||||||
if (mip >= mipLevels)
|
if (mip >= mipLevels)
|
||||||
@ -1740,72 +1536,6 @@ 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
|
// Blob - Bitmap image container
|
||||||
@ -1845,7 +1575,7 @@ HRESULT Blob::Initialize(size_t size) noexcept
|
|||||||
|
|
||||||
Release();
|
Release();
|
||||||
|
|
||||||
m_buffer = reinterpret_cast<uint8_t*>(_aligned_malloc(size, 16));
|
m_buffer = _aligned_malloc(size, 16);
|
||||||
if (!m_buffer)
|
if (!m_buffer)
|
||||||
{
|
{
|
||||||
Release();
|
Release();
|
||||||
@ -1881,7 +1611,7 @@ HRESULT Blob::Resize(size_t size) noexcept
|
|||||||
if (!m_buffer || !m_size)
|
if (!m_buffer || !m_size)
|
||||||
return E_UNEXPECTED;
|
return E_UNEXPECTED;
|
||||||
|
|
||||||
auto tbuffer = reinterpret_cast<uint8_t*>(_aligned_malloc(size, 16));
|
void *tbuffer = _aligned_malloc(size, 16);
|
||||||
if (!tbuffer)
|
if (!tbuffer)
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
|
|
||||||
|
|||||||
@ -25,12 +25,6 @@ namespace
|
|||||||
const GUID& source;
|
const GUID& source;
|
||||||
const GUID& target;
|
const GUID& target;
|
||||||
TEX_ALPHA_MODE alphaMode;
|
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[] =
|
constexpr WICConvert g_WICConvert[] =
|
||||||
@ -82,9 +76,11 @@ namespace
|
|||||||
{ GUID_WICPixelFormat40bppCMYKAlpha, GUID_WICPixelFormat32bppRGBA, TEX_ALPHA_MODE_UNKNOWN }, // DXGI_FORMAT_R8G8B8A8_UNORM
|
{ GUID_WICPixelFormat40bppCMYKAlpha, GUID_WICPixelFormat32bppRGBA, TEX_ALPHA_MODE_UNKNOWN }, // DXGI_FORMAT_R8G8B8A8_UNORM
|
||||||
{ GUID_WICPixelFormat80bppCMYKAlpha, GUID_WICPixelFormat64bppRGBA, TEX_ALPHA_MODE_UNKNOWN }, // DXGI_FORMAT_R16G16B16A16_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_WICPixelFormat32bppRGB, GUID_WICPixelFormat32bppRGBA, TEX_ALPHA_MODE_OPAQUE }, // DXGI_FORMAT_R8G8B8A8_UNORM
|
||||||
{ GUID_WICPixelFormat64bppRGB, GUID_WICPixelFormat64bppRGBA, TEX_ALPHA_MODE_OPAQUE }, // DXGI_FORMAT_R16G16B16A16_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
|
{ GUID_WICPixelFormat64bppPRGBAHalf, GUID_WICPixelFormat64bppRGBAHalf, TEX_ALPHA_MODE_UNKNOWN }, // DXGI_FORMAT_R16G16B16A16_FLOAT
|
||||||
|
#endif
|
||||||
|
|
||||||
// We don't support n-channel formats
|
// We don't support n-channel formats
|
||||||
};
|
};
|
||||||
@ -110,6 +106,7 @@ namespace
|
|||||||
{
|
{
|
||||||
if (memcmp(&GUID_WICPixelFormat96bppRGBFixedPoint, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0)
|
if (memcmp(&GUID_WICPixelFormat96bppRGBFixedPoint, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0)
|
||||||
{
|
{
|
||||||
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
|
||||||
if (iswic2)
|
if (iswic2)
|
||||||
{
|
{
|
||||||
if (pConvert)
|
if (pConvert)
|
||||||
@ -117,6 +114,9 @@ namespace
|
|||||||
format = DXGI_FORMAT_R32G32B32_FLOAT;
|
format = DXGI_FORMAT_R32G32B32_FLOAT;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#else
|
||||||
|
UNREFERENCED_PARAMETER(iswic2);
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
if (pConvert)
|
if (pConvert)
|
||||||
memcpy_s(pConvert, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat128bppRGBAFloat, sizeof(GUID));
|
memcpy_s(pConvert, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat128bppRGBAFloat, sizeof(GUID));
|
||||||
@ -203,7 +203,7 @@ namespace
|
|||||||
m_streamEOF(0),
|
m_streamEOF(0),
|
||||||
mRefCount(1)
|
mRefCount(1)
|
||||||
{
|
{
|
||||||
assert(mBlob.GetConstBufferPointer() && mBlob.GetBufferSize() > 0);
|
assert(mBlob.GetBufferPointer() && mBlob.GetBufferSize() > 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
@ -249,7 +249,7 @@ namespace
|
|||||||
HRESULT STDMETHODCALLTYPE Read(void* pv, ULONG cb, ULONG* pcbRead) override
|
HRESULT STDMETHODCALLTYPE Read(void* pv, ULONG cb, ULONG* pcbRead) override
|
||||||
{
|
{
|
||||||
size_t maxRead = m_streamEOF - m_streamPosition;
|
size_t maxRead = m_streamEOF - m_streamPosition;
|
||||||
auto ptr = mBlob.GetBufferPointer();
|
auto ptr = static_cast<const uint8_t*>(mBlob.GetBufferPointer());
|
||||||
if (cb > maxRead)
|
if (cb > maxRead)
|
||||||
{
|
{
|
||||||
const uint64_t pos = uint64_t(m_streamPosition) + uint64_t(maxRead);
|
const uint64_t pos = uint64_t(m_streamPosition) + uint64_t(maxRead);
|
||||||
@ -319,7 +319,7 @@ namespace
|
|||||||
if (pos > UINT32_MAX)
|
if (pos > UINT32_MAX)
|
||||||
return HRESULT_E_ARITHMETIC_OVERFLOW;
|
return HRESULT_E_ARITHMETIC_OVERFLOW;
|
||||||
|
|
||||||
auto ptr = mBlob.GetBufferPointer();
|
auto ptr = static_cast<uint8_t*>(mBlob.GetBufferPointer());
|
||||||
memcpy(&ptr[m_streamPosition], pv, cb);
|
memcpy(&ptr[m_streamPosition], pv, cb);
|
||||||
|
|
||||||
m_streamPosition = static_cast<size_t>(pos);
|
m_streamPosition = static_cast<size_t>(pos);
|
||||||
@ -342,7 +342,7 @@ namespace
|
|||||||
|
|
||||||
if (blobSize >= size.LowPart)
|
if (blobSize >= size.LowPart)
|
||||||
{
|
{
|
||||||
auto ptr = mBlob.GetBufferPointer();
|
auto ptr = static_cast<uint8_t*>(mBlob.GetBufferPointer());
|
||||||
if (m_streamEOF < size.LowPart)
|
if (m_streamEOF < size.LowPart)
|
||||||
{
|
{
|
||||||
memset(&ptr[m_streamEOF], 0, size.LowPart - m_streamEOF);
|
memset(&ptr[m_streamEOF], 0, size.LowPart - m_streamEOF);
|
||||||
@ -362,7 +362,7 @@ namespace
|
|||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
auto ptr = mBlob.GetBufferPointer();
|
auto ptr = static_cast<uint8_t*>(mBlob.GetBufferPointer());
|
||||||
if (m_streamEOF < size.LowPart)
|
if (m_streamEOF < size.LowPart)
|
||||||
{
|
{
|
||||||
memset(&ptr[m_streamEOF], 0, size.LowPart - m_streamEOF);
|
memset(&ptr[m_streamEOF], 0, size.LowPart - m_streamEOF);
|
||||||
@ -525,7 +525,7 @@ namespace
|
|||||||
_In_ IWICBitmapFrameDecode *frame,
|
_In_ IWICBitmapFrameDecode *frame,
|
||||||
_Out_ TexMetadata& metadata,
|
_Out_ TexMetadata& metadata,
|
||||||
_Out_opt_ WICPixelFormatGUID* pConvert,
|
_Out_opt_ WICPixelFormatGUID* pConvert,
|
||||||
_In_ std::function<void(IWICMetadataQueryReader*)> getMQR)
|
_In_opt_ std::function<void(IWICMetadataQueryReader*)> getMQR)
|
||||||
{
|
{
|
||||||
if (!decoder || !frame)
|
if (!decoder || !frame)
|
||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
@ -1079,7 +1079,7 @@ namespace
|
|||||||
_In_ REFGUID containerFormat,
|
_In_ REFGUID containerFormat,
|
||||||
_Inout_ IStream* stream,
|
_Inout_ IStream* stream,
|
||||||
_In_opt_ const GUID* targetFormat,
|
_In_opt_ const GUID* targetFormat,
|
||||||
_In_ std::function<void(IPropertyBag2*)> setCustomProps)
|
_In_opt_ std::function<void(IPropertyBag2*)> setCustomProps)
|
||||||
{
|
{
|
||||||
if (!stream)
|
if (!stream)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
@ -1144,7 +1144,7 @@ namespace
|
|||||||
_In_ REFGUID containerFormat,
|
_In_ REFGUID containerFormat,
|
||||||
_Inout_ IStream* stream,
|
_Inout_ IStream* stream,
|
||||||
_In_opt_ const GUID* targetFormat,
|
_In_opt_ const GUID* targetFormat,
|
||||||
_In_ std::function<void(IPropertyBag2*)> setCustomProps)
|
_In_opt_ std::function<void(IPropertyBag2*)> setCustomProps)
|
||||||
{
|
{
|
||||||
if (!stream || nimages < 2)
|
if (!stream || nimages < 2)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
@ -1216,7 +1216,7 @@ namespace
|
|||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
HRESULT DirectX::GetMetadataFromWICMemory(
|
HRESULT DirectX::GetMetadataFromWICMemory(
|
||||||
const uint8_t* pSource,
|
const void* pSource,
|
||||||
size_t size,
|
size_t size,
|
||||||
WIC_FLAGS flags,
|
WIC_FLAGS flags,
|
||||||
TexMetadata& metadata,
|
TexMetadata& metadata,
|
||||||
@ -1239,7 +1239,7 @@ HRESULT DirectX::GetMetadataFromWICMemory(
|
|||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
hr = stream->InitializeFromMemory(static_cast<BYTE*>(const_cast<uint8_t*>(pSource)),
|
hr = stream->InitializeFromMemory(static_cast<BYTE*>(const_cast<void*>(pSource)),
|
||||||
static_cast<UINT>(size));
|
static_cast<UINT>(size));
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
@ -1307,7 +1307,7 @@ HRESULT DirectX::GetMetadataFromWICFile(
|
|||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
_Use_decl_annotations_
|
_Use_decl_annotations_
|
||||||
HRESULT DirectX::LoadFromWICMemory(
|
HRESULT DirectX::LoadFromWICMemory(
|
||||||
const uint8_t* pSource,
|
const void* pSource,
|
||||||
size_t size,
|
size_t size,
|
||||||
WIC_FLAGS flags,
|
WIC_FLAGS flags,
|
||||||
TexMetadata* metadata,
|
TexMetadata* metadata,
|
||||||
@ -1333,7 +1333,7 @@ HRESULT DirectX::LoadFromWICMemory(
|
|||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
hr = stream->InitializeFromMemory(static_cast<uint8_t*>(const_cast<uint8_t*>(pSource)), static_cast<DWORD>(size));
|
hr = stream->InitializeFromMemory(static_cast<uint8_t*>(const_cast<void*>(pSource)), static_cast<DWORD>(size));
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
@ -1617,56 +1617,3 @@ HRESULT DirectX::SaveToWICFile(
|
|||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------
|
|
||||||
// Adapters for /Zc:wchar_t- clients
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
|
|
||||||
|
|
||||||
namespace DirectX
|
|
||||||
{
|
|
||||||
HRESULT __cdecl GetMetadataFromWICFile(
|
|
||||||
_In_z_ const __wchar_t* szFile,
|
|
||||||
_In_ WIC_FLAGS flags,
|
|
||||||
_Out_ TexMetadata& metadata,
|
|
||||||
_In_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR)
|
|
||||||
{
|
|
||||||
return GetMetadataFromWICFile(reinterpret_cast<const unsigned short*>(szFile), flags, metadata, getMQR);
|
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
return LoadFromWICFile(reinterpret_cast<const unsigned short*>(szFile), flags, metadata, image, getMQR);
|
|
||||||
}
|
|
||||||
|
|
||||||
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,
|
|
||||||
_In_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps)
|
|
||||||
{
|
|
||||||
return SaveToWICFile(image, flags, guidContainerFormat, reinterpret_cast<const unsigned short*>(szFile), targetFormat, setCustomProps);
|
|
||||||
}
|
|
||||||
|
|
||||||
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,
|
|
||||||
_In_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps)
|
|
||||||
{
|
|
||||||
return SaveToWICFile(images, nimages, flags, guidContainerFormat, reinterpret_cast<const unsigned short*>(szFile), targetFormat, setCustomProps);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // !_NATIVE_WCHAR_T_DEFINED
|
|
||||||
|
|||||||
@ -138,10 +138,10 @@
|
|||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
<AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
<AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -165,10 +165,10 @@
|
|||||||
<OpenMPSupport>true</OpenMPSupport>
|
<OpenMPSupport>true</OpenMPSupport>
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
<AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -192,10 +192,10 @@
|
|||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
<AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
<AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -218,10 +218,10 @@
|
|||||||
<OpenMPSupport>true</OpenMPSupport>
|
<OpenMPSupport>true</OpenMPSupport>
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
<AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -246,10 +246,10 @@
|
|||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||||
<AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
<AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -272,10 +272,10 @@
|
|||||||
<OpenMPSupport>true</OpenMPSupport>
|
<OpenMPSupport>true</OpenMPSupport>
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
<FloatingPointModel>Fast</FloatingPointModel>
|
||||||
<AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
<AdditionalOptions>/Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
|
||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -347,13 +347,10 @@
|
|||||||
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
|
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
|
||||||
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
|
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
|
||||||
<_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\</_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>
|
</PropertyGroup>
|
||||||
<Exec Condition="!Exists('Shaders/Compiled/BC6HEncode_EncodeBlockCS.inc')" WorkingDirectory="$(ProjectDir)Shaders" Command="CompileShaders" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath);WindowsSDKVersion=$(_ATGFXCVer);CompileShadersOutput=$(ProjectDir)Shaders/Compiled" LogStandardErrorAsError="true" />
|
<Exec Condition="!Exists('Shaders/Compiled/BC6HEncode_EncodeBlockCS.inc')" WorkingDirectory="$(ProjectDir)Shaders" Command="CompileShaders" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath)" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_ATGFXCPath />
|
<_ATGFXCPath />
|
||||||
<_ATGFXCVer />
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Target>
|
</Target>
|
||||||
<Target Name="ATGDeleteShaders" AfterTargets="Clean">
|
<Target Name="ATGDeleteShaders" AfterTargets="Clean">
|
||||||
|
|||||||
@ -196,7 +196,7 @@
|
|||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -223,7 +223,7 @@
|
|||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -250,7 +250,7 @@
|
|||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -277,7 +277,7 @@
|
|||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -303,7 +303,7 @@
|
|||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -330,7 +330,7 @@
|
|||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -358,7 +358,7 @@
|
|||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -384,7 +384,7 @@
|
|||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -411,7 +411,7 @@
|
|||||||
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir);..\Common;$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
@ -437,12 +437,12 @@
|
|||||||
</None>
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\Common\d3dx12.h" />
|
|
||||||
<CLInclude Include="BC.h" />
|
<CLInclude Include="BC.h" />
|
||||||
<ClCompile Include="BC.cpp" />
|
<ClCompile Include="BC.cpp" />
|
||||||
<ClCompile Include="BC4BC5.cpp" />
|
<ClCompile Include="BC4BC5.cpp" />
|
||||||
<ClCompile Include="BC6HBC7.cpp" />
|
<ClCompile Include="BC6HBC7.cpp" />
|
||||||
<ClInclude Include="BCDirectCompute.h" />
|
<ClInclude Include="BCDirectCompute.h" />
|
||||||
|
<ClInclude Include="d3dx12.h" />
|
||||||
<CLInclude Include="DDS.h" />
|
<CLInclude Include="DDS.h" />
|
||||||
<ClInclude Include="filters.h" />
|
<ClInclude Include="filters.h" />
|
||||||
<CLInclude Include="scoped.h" />
|
<CLInclude Include="scoped.h" />
|
||||||
@ -488,13 +488,10 @@
|
|||||||
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
|
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
|
||||||
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
|
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
|
||||||
<_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\</_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>
|
</PropertyGroup>
|
||||||
<Exec Condition="!Exists('Shaders/Compiled/BC6HEncode_EncodeBlockCS.inc')" WorkingDirectory="$(ProjectDir)Shaders" Command="CompileShaders" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath);WindowsSDKVersion=$(_ATGFXCVer);CompileShadersOutput=$(ProjectDir)Shaders/Compiled" LogStandardErrorAsError="true" />
|
<Exec Condition="!Exists('Shaders/Compiled/BC6HEncode_EncodeBlockCS.inc')" WorkingDirectory="$(ProjectDir)Shaders" Command="CompileShaders" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath)" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_ATGFXCPath />
|
<_ATGFXCPath />
|
||||||
<_ATGFXCVer />
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Target>
|
</Target>
|
||||||
<Target Name="ATGDeleteShaders" AfterTargets="Clean">
|
<Target Name="ATGDeleteShaders" AfterTargets="Clean">
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user