From 5d41a4dbd319c3266b21eee06bb6459adb59c2e7 Mon Sep 17 00:00:00 2001 From: Darren Wihandi <65404740+fairywreath@users.noreply.github.com> Date: Mon, 21 Apr 2025 10:49:25 -0600 Subject: Fix quad control required SPIRV version for emit-spirv-via-glsl (#6869) Co-authored-by: Yong He --- source/slang/hlsl.meta.slang | 2 ++ tests/hlsl-intrinsic/quad-control/quad-control-comp-functionality.slang | 1 + 2 files changed, 3 insertions(+) diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang index 6b1a4579f..c8a2c8c58 100644 --- a/source/slang/hlsl.meta.slang +++ b/source/slang/hlsl.meta.slang @@ -16382,6 +16382,7 @@ bool IsHelperLane() __glsl_extension(GL_KHR_shader_subgroup_vote) __glsl_extension(GL_EXT_maximal_reconvergence) __glsl_extension(GL_EXT_shader_quad_control) +__spirv_version(1.3) [ForceInline] [require(glsl_hlsl_metal_spirv, quad_control)] bool QuadAny(bool expr) @@ -16406,6 +16407,7 @@ bool QuadAny(bool expr) __glsl_extension(GL_KHR_shader_subgroup_vote) __glsl_extension(GL_EXT_maximal_reconvergence) __glsl_extension(GL_EXT_shader_quad_control) +__spirv_version(1.3) [ForceInline] [require(glsl_hlsl_metal_spirv, quad_control)] bool QuadAll(bool expr) diff --git a/tests/hlsl-intrinsic/quad-control/quad-control-comp-functionality.slang b/tests/hlsl-intrinsic/quad-control/quad-control-comp-functionality.slang index 77ca03178..f64cb6057 100644 --- a/tests/hlsl-intrinsic/quad-control/quad-control-comp-functionality.slang +++ b/tests/hlsl-intrinsic/quad-control/quad-control-comp-functionality.slang @@ -1,4 +1,5 @@ //TEST(compute):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -emit-spirv-directly +//TEST(compute):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -emit-spirv-via-glsl //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -profile cs_6_7 -dx12 -use-dxil -shaderobj -render-feature hardware-device //TEST(compute):COMPARE_COMPUTE_EX:-metal -compute -shaderobj -xslang -DMETAL -- cgit v1.2.3