From a1827ee5e9b8088b23db3fa688b7bd62b7bbe9ac Mon Sep 17 00:00:00 2001 From: Yong He Date: Fri, 23 Feb 2024 19:05:23 -0800 Subject: SPIRV Fixes. (#3622) * Use SpvSourceLanguageSlang enum. * Fix spirv entrypoint interface. * Cleanup. * Add error on unknown spirv opcode. * Fix CI. * Fix. --- .github/workflows/linux-arm64.yml | 2 +- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/linux-arm64.yml b/.github/workflows/linux-arm64.yml index 0c18ffe6b..a35672c5f 100644 --- a/.github/workflows/linux-arm64.yml +++ b/.github/workflows/linux-arm64.yml @@ -56,4 +56,4 @@ jobs: CC=${{matrix.compiler}} ARCH=${{matrix.platform}} PATH="${PATH:+${PATH}:}$(pwd)/external/slang-binaries/spirv-tools/$(uname -m)-linux/bin" - source ./github_test.sh + source .github/github_test.sh diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 427823f6b..8180965f9 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -72,4 +72,4 @@ jobs: CC=${{matrix.compiler}} ARCH=${{matrix.platform}} PATH="${PATH:+${PATH}:}$(pwd)/external/slang-binaries/spirv-tools/$(uname -m)-linux/bin" - source ./github_test.sh + source .github/github_test.sh diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 11d54a247..30a3fe003 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -69,4 +69,4 @@ jobs: CONFIGURATION=${{matrix.configuration}} CC=${{matrix.compiler}} ARCH=${{matrix.targetPlatform}} - source ./github_test.sh + source .github/github_test.sh diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 91843d4dd..3dc4abfb5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -68,6 +68,7 @@ jobs: $spirvToolsBinDir = ".\external\slang-binaries\spirv-tools\windows-${{matrix.testPlatform}}\bin\"; $env:Path += ";$slangTestBinDir;$spirvToolsBinDir"; $env:SLANG_RUN_SPIRV_VALIDATION='1'; + $env:SLANG_USE_SPV_SOURCE_LANGUAGE_UNKNOWN='1'; Expand-Archive "vk_swiftshader_windows_${{matrix.testPlatform}}.zip" -DestinationPath $slangTestBinDir; & "$slangTestBinDir\slang-test.exe" -api all-dx12 -appveyor -bindir "$slangTestBinDir\" -platform ${{matrix.testPlatform}} -configuration ${{matrix.configuration}} -category ${{matrix.testCategory}} -expected-failure-list tests/expected-failure-github.txt 2>&1; -- cgit v1.2.3