diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/render-test/options.cpp | 1 | ||||
| -rw-r--r-- | tools/render-test/render-test-main.cpp | 6 | ||||
| -rw-r--r-- | tools/slang-test/slang-test-main.cpp | 9 | ||||
| -rw-r--r-- | tools/slang-test/test-context.h | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp index dc1850d37..07e8b0e2a 100644 --- a/tools/render-test/options.cpp +++ b/tools/render-test/options.cpp @@ -33,6 +33,7 @@ static rhi::DeviceType _toRenderType(Slang::RenderApiType apiType) case RenderApiType::Metal: return rhi::DeviceType::Metal; case RenderApiType::CPU: return rhi::DeviceType::CPU; case RenderApiType::CUDA: return rhi::DeviceType::CUDA; + case RenderApiType::WebGPU: return rhi::DeviceType::WGPU; default: return rhi::DeviceType::Default; } diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp index 9e1d60155..31c24b028 100644 --- a/tools/render-test/render-test-main.cpp +++ b/tools/render-test/render-test-main.cpp @@ -1192,6 +1192,12 @@ static SlangResult _innerMain(Slang::StdWriters* stdWriters, SlangSession* sessi nativeLanguage = SLANG_SOURCE_LANGUAGE_CUDA; slangPassThrough = SLANG_PASS_THROUGH_NVRTC; break; + case DeviceType::WGPU: + input.target = SLANG_WGSL; + input.profile = ""; + nativeLanguage = SLANG_SOURCE_LANGUAGE_WGSL; + slangPassThrough = SLANG_PASS_THROUGH_NONE; + break; default: fprintf(stderr, "error: unexpected\n"); diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp index a620a7120..d387c815a 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -972,6 +972,11 @@ static PassThroughFlags _getPassThroughFlagsForTarget(SlangCompileTarget target) { return 0; } + case SLANG_WGSL_SPIRV: + case SLANG_WGSL_SPIRV_ASM: + { + return PassThroughFlag::Tint; + } case SLANG_DXBC: case SLANG_DXBC_ASM: { @@ -1117,6 +1122,10 @@ static SlangResult _extractRenderTestRequirements(const CommandLine& cmdLine, Te nativeLanguage = SLANG_SOURCE_LANGUAGE_CUDA; passThru = SLANG_PASS_THROUGH_NVRTC; break; + case RenderApiType::WebGPU: + target = SLANG_WGSL; + SLANG_ASSERT(!usePassthru); + break; } SlangSourceLanguage sourceLanguage = nativeLanguage; diff --git a/tools/slang-test/test-context.h b/tools/slang-test/test-context.h index 314ec2803..c1bd82c8c 100644 --- a/tools/slang-test/test-context.h +++ b/tools/slang-test/test-context.h @@ -38,7 +38,7 @@ struct PassThroughFlag NVRTC = 1 << int(SLANG_PASS_THROUGH_NVRTC), LLVM = 1 << int(SLANG_PASS_THROUGH_LLVM), Metal = 1 << int(SLANG_PASS_THROUGH_METAL), - WGSL = 1 << int(SLANG_PASS_THROUGH_WGSL) + Tint = 1 << int(SLANG_PASS_THROUGH_TINT), }; }; |