From 07f21ee31b5f427edb72d5578f713b3da3f3b96f Mon Sep 17 00:00:00 2001 From: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com> Date: Fri, 8 Aug 2025 13:19:25 -0700 Subject: Error if super-type capabilities are a super-set of sub-type (#7452) Fixes: #7410 Changes: 1. super-type capabilities must be a super-set of sub-type capabilities (and support the same shader stages/targets) * InheritanceDecl visits super-type to inherit it's capabilities; validate InheritanceDecl capabilities against sub-type * visit all container decl's with a default case * clean up functionDeclBase visitor * Simplify `diagnoseUndeclaredCapability` by moving logic into capability checking (more correct*) 3. added changed behavior to documentation 4. fixed some incorrect capabilities 5. **we do not** diagnose capability errors on interface requirement-to-implementation if both lack explicit capability requirements. This change is to work around a slangpy regression (test case for the failing situation is in `tests\language-feature\capability\capability-interface-extension-1.slang`), Note: maybe for slang-2026 we don't do this? 6. requirement & implementation must support the same shader stage/target. This was changed because otherwise we can have cases where `X` inherits from `Y`, but `Y` is only expected to be used in `glsl` whilst `X` is expected to be used in `hlsl | glsl` 7. removed `tests/language-feature/capability/capabilitySimplification3.slang` because it tests nothing special (redundant) Note: not using rebase due to separate branches depending on this PR --------- Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- .../capability/capabilitySimplification3.slang | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 tests/language-feature/capability/capabilitySimplification3.slang (limited to 'tests/language-feature/capability/capabilitySimplification3.slang') diff --git a/tests/language-feature/capability/capabilitySimplification3.slang b/tests/language-feature/capability/capabilitySimplification3.slang deleted file mode 100644 index 150f926a9..000000000 --- a/tests/language-feature/capability/capabilitySimplification3.slang +++ /dev/null @@ -1,17 +0,0 @@ -//TEST:SIMPLE(filecheck=CHECK): -target glsl -entry computeMain -stage compute -profile sm_5_0 -//TEST:SIMPLE(filecheck=CHECK_IGNORE_CAPS): -target glsl -emit-spirv-directly -entry computeMain -stage compute -profile sm_5_0 -ignore-capabilities - - -// CHECK_IGNORE_CAPS-NOT: error 36107 - -// CHECK: error 36107: entrypoint 'computeMain' uses features that are not available in 'compute' stage for 'glsl' target. -// CHECK: capabilitySimplification3.slang(16): note: see using of 'WaveMultiPrefixCountBits' -// CHECK-NOT: see using of 'WaveMultiPrefixCountBits' -// CHECK: {{.*}}.meta.slang({{.*}}): note: see definition of 'WaveMultiPrefixCountBits' -// CHECK: {{.*}}.meta.slang({{.*}}): note: see declaration of 'require' - -[numthreads(1,1,1)] -void computeMain() -{ - WaveMultiPrefixCountBits(true, 0); -} -- cgit v1.2.3