From c9e9efaaf064dc0a3d3a538506f5f0f47de9b674 Mon Sep 17 00:00:00 2001 From: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com> Date: Tue, 27 May 2025 18:31:25 -0700 Subject: Change default descriptor binding to be VkMutable (#7224) * change default descriptor binding to be VkMutable --- tests/language-feature/descriptor-handle/desc-handle-default.slang | 6 ++++++ .../descriptor-handle/desc-handle-vk-mutable-descriptor.slang | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'tests/language-feature') diff --git a/tests/language-feature/descriptor-handle/desc-handle-default.slang b/tests/language-feature/descriptor-handle/desc-handle-default.slang index d442fb610..016b04bfb 100644 --- a/tests/language-feature/descriptor-handle/desc-handle-default.slang +++ b/tests/language-feature/descriptor-handle/desc-handle-default.slang @@ -10,6 +10,12 @@ //TEST:SIMPLE(filecheck=SAMPLED_IMAGE): -target spirv -stage compute -entry computeMain -DSAMPLED_IMAGE //TEST:SIMPLE(filecheck=MIX): -target spirv -stage compute -entry computeMain -DSAMPLER -DSTORAGE_TEXEL_BUFFER -DUNIFORM_BUFFER -DACCELERATION_STRUCTURE + +export T getDescriptorFromHandle(DescriptorHandle handleValue) +{ + return defaultGetDescriptorFromHandle(handleValue, BindlessDescriptorOptions.None); +} + // To intentionally fill up binding slots [[vk::binding(0, 1)]] RWTexture1D t1; diff --git a/tests/language-feature/descriptor-handle/desc-handle-vk-mutable-descriptor.slang b/tests/language-feature/descriptor-handle/desc-handle-vk-mutable-descriptor.slang index 8fc2d3283..2bf57d0ef 100644 --- a/tests/language-feature/descriptor-handle/desc-handle-vk-mutable-descriptor.slang +++ b/tests/language-feature/descriptor-handle/desc-handle-vk-mutable-descriptor.slang @@ -1,4 +1,5 @@ //TEST:SIMPLE(filecheck=CHECK): -target spirv -stage compute -entry computeMain +//TEST:SIMPLE(filecheck=CHECK): -target spirv -stage compute -entry computeMain -DIS_DEFAULT // To intentionally fill up binding slots [[vk::binding(0, 1)]] @@ -25,10 +26,13 @@ Texture1D t4; //CHECK-NOT: OpDecorate %__slang_resource_heap{{.*}} Binding 7 //CHECK-NOT: OpDecorate %__slang_resource_heap{{.*}} Binding 8 //CHECK-NOT: OpDecorate %__slang_resource_heap{{.*}} Binding 9 + +#ifndef IS_DEFAULT export T getDescriptorFromHandle(DescriptorHandle handleValue) { return defaultGetDescriptorFromHandle(handleValue, BindlessDescriptorOptions.VkMutable); } +#endif uniform SamplerState.Handle sampler; uniform Sampler1DShadow.Handle combinedSampler; -- cgit v1.2.3