From d84aeeffdba388aec7a781c35973bf404d37fe80 Mon Sep 17 00:00:00 2001 From: Gangzheng Tong Date: Fri, 25 Apr 2025 10:39:45 -0700 Subject: Update spirv-tools to for SDK v2025.2 (#6893) * Update spirv-tools to for SDK v2025.2 Fixes: #6850 * bump spirv version to 1.4 for op linkage * skip-spirv-validation for coop mat * add skip-spirv-validation option to slang session desc * use SPV_ENV_UNIVERSAL_1_6 for spirv-tool env target Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --------- Co-authored-by: slangbot Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- tools/render-test/options.cpp | 4 ++++ tools/render-test/options.h | 2 ++ tools/render-test/slang-support.cpp | 1 + 3 files changed, 7 insertions(+) (limited to 'tools') diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp index ed6c6a3c6..e50166017 100644 --- a/tools/render-test/options.cpp +++ b/tools/render-test/options.cpp @@ -158,6 +158,10 @@ static rhi::DeviceType _toRenderType(Slang::RenderApiType apiType) { outOptions.useDXIL = true; } + else if (argValue == "-skip-spirv-validation") + { + outOptions.skipSPIRVValidation = true; + } else if (argValue == "-emit-spirv-directly") { outOptions.generateSPIRVDirectly = true; diff --git a/tools/render-test/options.h b/tools/render-test/options.h index d94504c10..4c7e6faa1 100644 --- a/tools/render-test/options.h +++ b/tools/render-test/options.h @@ -93,6 +93,8 @@ struct Options bool showAdapterInfo = false; + bool skipSPIRVValidation = false; + Options() { downstreamArgs.addName("slang"); } static SlangResult parse( diff --git a/tools/render-test/slang-support.cpp b/tools/render-test/slang-support.cpp index dfde5f386..c54abb1f8 100644 --- a/tools/render-test/slang-support.cpp +++ b/tools/render-test/slang-support.cpp @@ -199,6 +199,7 @@ static SlangResult _compileProgramImpl( sessionDesc.targetCount = 1; sessionDesc.targets = &sessionTargetDesc; + sessionDesc.skipSPIRVValidation = options.skipSPIRVValidation; if (options.generateSPIRVDirectly) { slang::CompilerOptionEntry entry; -- cgit v1.2.3