Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADO test pipeline updates #504

Merged
merged 4 commits into from
Sep 3, 2024
Merged

ADO test pipeline updates #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da9e68e
ADO test pipeline updates
walbourn Sep 3, 2024
623d7c5
YAML fix
walbourn Sep 3, 2024
ef75f8a
Minor fix for JPEG module to not set alpha mode for no alpha formats
walbourn Sep 3, 2024
3bd6160
minor error code tweak
walbourn Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Auxiliary/DirectXTexJPEG.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,15 @@ namespace
metadata.arraySize = 1;
metadata.mipLevels = 1;
metadata.dimension = TEX_DIMENSION_TEXTURE2D;
metadata.miscFlags2 |= TEX_ALPHA_MODE_OPAQUE;

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)
Expand Down Expand Up @@ -293,7 +297,7 @@ namespace
#endif

default:
return E_INVALIDARG;
return HRESULT_E_NOT_SUPPORTED;
}
enc.image_width = static_cast<JDIMENSION>(image.width);
enc.image_height = static_cast<JDIMENSION>(image.height);
Expand Down
5 changes: 4 additions & 1 deletion CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,9 @@
{ "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-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 changes: 9 additions & 0 deletions build/DirectXTex-GitHub-Test-Dev17.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ variables:
Codeql.Enabled: false
VC_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
GUID_FEED: $(ADOFeedGUID)

jobs:
- job: DESKTOP_BUILD
Expand All @@ -61,6 +62,14 @@ jobs:
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxtextest.git Tests
workingDirectory: $(Build.SourcesDirectory)
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
displayName: Build solution DirectXTex_Tests_Desktop_2022.sln 32dbg
inputs:
Expand Down
9 changes: 9 additions & 0 deletions build/DirectXTex-GitHub-Test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ pool:
variables:
Codeql.Enabled: false
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
GUID_FEED: $(ADOFeedGUID)

jobs:
- job: DESKTOP_BUILD
Expand All @@ -59,6 +60,14 @@ jobs:
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxtextest.git Tests
workingDirectory: $(Build.SourcesDirectory)
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
displayName: Build solution DirectXTex_Tests_Desktop_2019.sln 32dbg
inputs:
Expand Down
Loading