Skip to content

Commit fc7de92

Browse files
authored
Update slang-rhi and fix error handling (shader-slang#5485)
Update slang-rhi to pick up a fix in webgpu compilation error handling. In doRenderComparisonTestRun(), only return TestResult::Pass if the shader is ran actually compiled. A similar check is in place elsewhere in slang-test-main, but was missed in doRenderComparisonTestRun(). Add two tests to the github CI skiplist, and use the skiplist in one additional CI config that was running without it. Closes 5291
1 parent b118451 commit fc7de92

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

.github/workflows/ci.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ jobs:
145145
-use-test-server \
146146
-server-count 8 \
147147
-category ${{ matrix.test-category }} \
148-
-api all-cpu
148+
-api all-cpu \
149+
-expected-failure-list tests/expected-failure-github.txt
149150
elif [[ "${{matrix.has-gpu}}" == "true" ]]; then
150151
"$bin_dir/slang-test" \
151152
-use-test-server \

tests/expected-failure-github.txt

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ tests/autodiff/global-param-hoisting.slang.4 syn (wgpu)
1717
tests/autodiff/material/diff-bwd-falcor-material-system.slang.2 syn (wgpu)
1818
tests/autodiff/material2/diff-bwd-falcor-material-system.slang.2 syn (wgpu)
1919
tests/autodiff/matrix-arithmetic-fwd.slang.2 syn (wgpu)
20+
tests/autodiff/no-diff-strip.slang.3 syn (wgpu)
2021
tests/autodiff/reverse-loop-checkpoint-test.slang.3 syn (wgpu)
2122
tests/bindings/nested-parameter-block-2.slang.4 syn (wgpu)
2223
tests/bindings/nested-parameter-block-3.slang.4 syn (wgpu)
@@ -39,6 +40,7 @@ tests/bugs/op-assignment-unify-mat.slang.4 syn (wgpu)
3940
tests/bugs/shadowed-lookup.slang.1 syn (wgpu)
4041
tests/bugs/specialize-function-array-args.slang.2 syn (wgpu)
4142
tests/bugs/static-var.slang.1 syn (wgpu)
43+
tests/bugs/texture2d-gather.hlsl.2 syn (wgpu)
4244
tests/bugs/user-attribute-lookup.slang.2 syn (wgpu)
4345
tests/compute/atomics (wgpu)
4446
tests/compute/atomics-buffer (wgpu)

tools/slang-test/slang-test-main.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -3583,6 +3583,11 @@ TestResult doRenderComparisonTestRun(
35833583

35843584
*outOutput = output;
35853585

3586+
// Always fail if the compilation produced a failure.
3587+
if (exeRes.resultCode != 0)
3588+
{
3589+
return TestResult::Fail;
3590+
}
35863591
return TestResult::Pass;
35873592
}
35883593

0 commit comments

Comments
 (0)