Skip to content

Commit 55b93ef

Browse files
authored
ADO test pipeline updates (#504)
1 parent c401f2f commit 55b93ef

4 files changed

+29
-4
lines changed

Auxiliary/DirectXTexJPEG.cpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,15 @@ namespace
141141
metadata.arraySize = 1;
142142
metadata.mipLevels = 1;
143143
metadata.dimension = TEX_DIMENSION_TEXTURE2D;
144-
metadata.miscFlags2 |= TEX_ALPHA_MODE_OPAQUE;
145-
146144
metadata.format = TranslateColor(dec.out_color_space);
147145
if (metadata.format == DXGI_FORMAT_UNKNOWN)
146+
{
148147
throw std::runtime_error{ "unexpected out_color_space in jpeg_decompress_struct" };
148+
}
149+
if (metadata.format == DXGI_FORMAT_R8G8B8A8_UNORM)
150+
{
151+
metadata.miscFlags2 |= TEX_ALPHA_MODE_OPAQUE;
152+
}
149153
}
150154

151155
HRESULT GetHeader(TexMetadata& metadata) noexcept(false)
@@ -293,7 +297,7 @@ namespace
293297
#endif
294298

295299
default:
296-
return E_INVALIDARG;
300+
return HRESULT_E_NOT_SUPPORTED;
297301
}
298302
enc.image_width = static_cast<JDIMENSION>(image.width);
299303
enc.image_height = static_cast<JDIMENSION>(image.height);

CMakePresets.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,9 @@
381381
{ "name": "x64-Release-ICC" , "configurePreset": "x64-Release-ICC"},
382382

383383
{ "name": "x64-Debug-ICX" , "configurePreset": "x64-Debug-ICX" },
384-
{ "name": "x64-Release-ICX" , "configurePreset": "x64-Release-ICX"}
384+
{ "name": "x64-Release-ICX" , "configurePreset": "x64-Release-ICX"},
385+
386+
{ "name": "x64-Debug-JPEG-PNG" , "configurePreset": "x64-Debug-JPEG-PNG" },
387+
{ "name": "x64-Release-JPEG-PNG", "configurePreset": "x64-Release-JPEG-PNG"}
385388
]
386389
}

build/DirectXTex-GitHub-Test-Dev17.yml

+9
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ variables:
3838
Codeql.Enabled: false
3939
VC_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
4040
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
41+
GUID_FEED: $(ADOFeedGUID)
4142

4243
jobs:
4344
- job: DESKTOP_BUILD
@@ -61,6 +62,14 @@ jobs:
6162
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxtextest.git Tests
6263
workingDirectory: $(Build.SourcesDirectory)
6364
failOnStderr: true
65+
- task: NuGetToolInstaller@1
66+
displayName: 'Use NuGet'
67+
- task: NuGetCommand@2
68+
displayName: NuGet restore tests
69+
inputs:
70+
solution: Tests/DirectXTex_Tests_Desktop_2022.sln
71+
feedRestore: $(GUID_FEED)
72+
includeNuGetOrg: false
6473
- task: VSBuild@1
6574
displayName: Build solution DirectXTex_Tests_Desktop_2022.sln 32dbg
6675
inputs:

build/DirectXTex-GitHub-Test.yml

+9
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ pool:
3636
variables:
3737
Codeql.Enabled: false
3838
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
39+
GUID_FEED: $(ADOFeedGUID)
3940

4041
jobs:
4142
- job: DESKTOP_BUILD
@@ -59,6 +60,14 @@ jobs:
5960
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxtextest.git Tests
6061
workingDirectory: $(Build.SourcesDirectory)
6162
failOnStderr: true
63+
- task: NuGetToolInstaller@1
64+
displayName: 'Use NuGet'
65+
- task: NuGetCommand@2
66+
displayName: NuGet restore tests
67+
inputs:
68+
solution: Tests/DirectXTex_Tests_Desktop_2019.sln
69+
feedRestore: $(GUID_FEED)
70+
includeNuGetOrg: false
6271
- task: VSBuild@1
6372
displayName: Build solution DirectXTex_Tests_Desktop_2019.sln 32dbg
6473
inputs:

0 commit comments

Comments
 (0)