From 17d1a2c8c3ff6b357b99faaefff7caa7200be2f8 Mon Sep 17 00:00:00 2001 From: Gangzheng Tong Date: Wed, 9 Apr 2025 14:41:41 -0700 Subject: Get real value for typeAdapter (#6762) * Get real value for typeAdapter When the type is mismatch and typeAdapter is used, get the real value from typeAdapter so that we don't get nullptr for irValue. This fixes the assert if uint is used for SV_VertexID, which is an int in the system binding semantic. Fixes: #6525 * Add test case; add nullptr check --- source/slang/slang-ir-glsl-legalize.cpp | 9 +++++++++ tests/bugs/gh-6525.slang | 16 ++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 tests/bugs/gh-6525.slang diff --git a/source/slang/slang-ir-glsl-legalize.cpp b/source/slang/slang-ir-glsl-legalize.cpp index 455c924ca..802fc1eb4 100644 --- a/source/slang/slang-ir-glsl-legalize.cpp +++ b/source/slang/slang-ir-glsl-legalize.cpp @@ -3541,6 +3541,15 @@ void legalizeEntryPointParameterForGLSL( if (elem.key == key) { realGlobalVar = elem.val.irValue; + if (!realGlobalVar && + ScalarizedVal::Flavor::typeAdapter == elem.val.flavor) + { + if (auto typeAdapterVal = + as(elem.val.impl)) + { + realGlobalVar = typeAdapterVal->val.irValue; + } + } break; } } diff --git a/tests/bugs/gh-6525.slang b/tests/bugs/gh-6525.slang new file mode 100644 index 000000000..fe57b601c --- /dev/null +++ b/tests/bugs/gh-6525.slang @@ -0,0 +1,16 @@ +//TEST:SIMPLE(filecheck=CHECK): -target spirv + +//CHECK: OpEntryPoint + +// SV_VertexID is a int in the system binding semantic. +// However, declare it as uint should also work with +// the typeAdapter mechanism in Slang compiler. +in uint gl_VertexIndex : SV_VertexID; + +static const float2 uvs[] = { float2(0.0, 0.0), float2(0.0, 2.0), float2(2.0, 0.0) }; + +[shader("vertex")] +float4 vert_main() : SV_Position{ + const float2 uv = uvs[gl_VertexIndex]; + return float4((uv * 2.0 - 1.0), 0.0, 1.0); +} \ No newline at end of file -- cgit v1.2.3