AuroraMiddleware/DirectXTex
1
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex synced 2024-11-21 12:00:06 +00:00
Code Issues Releases Wiki Activity

ADO test pipeline updates (#504)

Browse Source
This commit is contained in:
Chuck Walbourn 2024-09-03 11:52:27 -07:00 committed by GitHub
parent c401f2fe16
commit 55b93efe35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Auxiliary/DirectXTexJPEG.cpp
View File

@ -141,11 +141,15 @@ namespace
metadata.arraySize = 1; metadata.arraySize = 1;
metadata.mipLevels = 1; metadata.mipLevels = 1;
metadata.dimension = TEX_DIMENSION_TEXTURE2D; metadata.dimension = TEX_DIMENSION_TEXTURE2D;
metadata.miscFlags2 |= TEX_ALPHA_MODE_OPAQUE;
metadata.format = TranslateColor(dec.out_color_space); metadata.format = TranslateColor(dec.out_color_space);
if (metadata.format == DXGI_FORMAT_UNKNOWN) if (metadata.format == DXGI_FORMAT_UNKNOWN)
{
throw std::runtime_error{ "unexpected out_color_space in jpeg_decompress_struct" }; 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) HRESULT GetHeader(TexMetadata& metadata) noexcept(false)
@ -293,7 +297,7 @@ namespace
#endif #endif
default: default:
return E_INVALIDARG; return HRESULT_E_NOT_SUPPORTED;
} }
enc.image_width = static_cast<JDIMENSION>(image.width); enc.image_width = static_cast<JDIMENSION>(image.width);
enc.image_height = static_cast<JDIMENSION>(image.height); enc.image_height = static_cast<JDIMENSION>(image.height);

5
CMakePresets.json
View File

@ -381,6 +381,9 @@
{ "name": "x64-Release-ICC" , "configurePreset": "x64-Release-ICC"}, { "name": "x64-Release-ICC" , "configurePreset": "x64-Release-ICC"},
{ "name": "x64-Debug-ICX" , "configurePreset": "x64-Debug-ICX" }, { "name": "x64-Debug-ICX" , "configurePreset": "x64-Debug-ICX" },
{ "name": "x64-Release-ICX" , "configurePreset": "x64-Release-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"}
] ]
} }

9
build/DirectXTex-GitHub-Test-Dev17.yml
View File

@ -38,6 +38,7 @@ variables:
Codeql.Enabled: false Codeql.Enabled: false
VC_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC' VC_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
GITHUB_PAT: $(GITHUBPUBLICTOKEN) GITHUB_PAT: $(GITHUBPUBLICTOKEN)
GUID_FEED: $(ADOFeedGUID)
jobs: jobs:
- job: DESKTOP_BUILD - job: DESKTOP_BUILD
@ -61,6 +62,14 @@ jobs:
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxtextest.git Tests script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxtextest.git Tests
workingDirectory: $(Build.SourcesDirectory) workingDirectory: $(Build.SourcesDirectory)
failOnStderr: true failOnStderr: true
- 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 - task: VSBuild@1
displayName: Build solution DirectXTex_Tests_Desktop_2022.sln 32dbg displayName: Build solution DirectXTex_Tests_Desktop_2022.sln 32dbg
inputs: inputs:

9
build/DirectXTex-GitHub-Test.yml
View File

@ -36,6 +36,7 @@ pool:
variables: variables:
Codeql.Enabled: false Codeql.Enabled: false
GITHUB_PAT: $(GITHUBPUBLICTOKEN) GITHUB_PAT: $(GITHUBPUBLICTOKEN)
GUID_FEED: $(ADOFeedGUID)
jobs: jobs:
- job: DESKTOP_BUILD - job: DESKTOP_BUILD
@ -59,6 +60,14 @@ jobs:
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxtextest.git Tests script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxtextest.git Tests
workingDirectory: $(Build.SourcesDirectory) workingDirectory: $(Build.SourcesDirectory)
failOnStderr: true failOnStderr: true
- 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 - task: VSBuild@1
displayName: Build solution DirectXTex_Tests_Desktop_2019.sln 32dbg displayName: Build solution DirectXTex_Tests_Desktop_2019.sln 32dbg
inputs: inputs: