Skip to content

Commit 9d5d006

Browse files
committed
Fix Falcor test: don't overwrite D3D12 Agility SDK DLLs from CI artifact
The CI artifact includes D3D12/D3D12Core.dll and D3D12/d3d12SDKLayers.dll (from the Dawn-enabled build), but the old Falcor-specific build excluded Dawn and never produced these files. Copying them over the versions already present from C:\Falcor (via setup-falcor) overwrites the D3D12 Agility SDK version that FalcorTest.exe was compiled against, causing FalcorTest.exe to exit immediately on startup. Remove D3D12/ and optix/ from the selective copy; the correct versions are already provided by setup-falcor from C:\Falcor.
1 parent 78c8872 commit 9d5d006

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/ci-falcor-test.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,15 @@ jobs:
5454
# slang-rt.dll must be copied alongside slang.dll: it is a version-matched
5555
# runtime peer, and leaving C:\Falcor's older copy in place while replacing
5656
# slang.dll causes FalcorTest.exe to crash during DLL initialization.
57+
# D3D12/ (D3D12 Agility SDK DLLs) and optix/ are intentionally NOT copied
58+
# from the CI artifact: the old Falcor-specific build did not produce these
59+
# directories, so the versions already present from C:\Falcor (copied during
60+
# setup-falcor) are correct for FalcorTest.exe. Overwriting them with the CI
61+
# artifact's versions would break FalcorTest.exe at startup.
5762
for name in slang.dll slang-rt.dll slang-compiler.dll slang-llvm.dll slang-glslang.dll slang-glsl-module.dll dxcompiler.dll dxil.dll slangc.exe; do
5863
[[ -f "$SRC/$name" ]] || { echo "Missing required file: $SRC/$name" >&2; exit 1; }
5964
cp --verbose "$SRC/$name" "$TARGET/"
6065
done
61-
for d in D3D12 optix; do
62-
[[ -d "$SRC/$d" ]] || { echo "Missing required directory: $SRC/$d" >&2; exit 1; }
63-
cp --verbose -r "$SRC/$d" "$TARGET/"
64-
done
6566
shopt -s nullglob
6667
modules=( "$SRC"/slang-standard-module-*/ )
6768
(( ${#modules[@]} > 0 )) || { echo "Missing slang-standard-module-* in $SRC" >&2; exit 1; }

0 commit comments

Comments
 (0)