summaryrefslogtreecommitdiff
path: root/tests/language-feature/descriptor-handle
diff options
context:
space:
mode:
Diffstat (limited to 'tests/language-feature/descriptor-handle')
-rw-r--r--tests/language-feature/descriptor-handle/desc-handle-1.slang2
-rw-r--r--tests/language-feature/descriptor-handle/desc-handle-default.slang4
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/language-feature/descriptor-handle/desc-handle-1.slang b/tests/language-feature/descriptor-handle/desc-handle-1.slang
index 0621f4a84..407aee684 100644
--- a/tests/language-feature/descriptor-handle/desc-handle-1.slang
+++ b/tests/language-feature/descriptor-handle/desc-handle-1.slang
@@ -16,7 +16,7 @@ export T getDescriptorFromHandle<T:IOpaqueDescriptor>(DescriptorHandle<T> handle
__target_switch
{
case spirv:
- if (T.kind != DescriptorKind.Buffer)
+ if (T.kind != DescriptorKind.ConstantBuffer && T.kind != DescriptorKind.StorageBuffer)
return resourceHeap[((uint2)handleValue).x].asOpaqueDescriptor<T>();
else
return defaultGetDescriptorFromHandle(handleValue);
diff --git a/tests/language-feature/descriptor-handle/desc-handle-default.slang b/tests/language-feature/descriptor-handle/desc-handle-default.slang
index 9a4d444d7..674662f4b 100644
--- a/tests/language-feature/descriptor-handle/desc-handle-default.slang
+++ b/tests/language-feature/descriptor-handle/desc-handle-default.slang
@@ -32,12 +32,12 @@ Texture1D<float> t4;
//MIX-DAG: OpDecorate %__slang_resource_heap{{.*}} Binding 0
//MIX-DAG: OpDecorate %__slang_resource_heap{{.*}} Binding 5
//MIX-DAG: OpDecorate %__slang_resource_heap{{.*}} Binding 6
+//MIX-DAG: OpDecorate %__slang_resource_heap{{.*}} Binding 7
//MIX-NOT: OpDecorate %__slang_resource_heap{{.*}} Binding 1
//MIX-NOT: OpDecorate %__slang_resource_heap{{.*}} Binding 2
//MIX-NOT: OpDecorate %__slang_resource_heap{{.*}} Binding 3
//MIX-NOT: OpDecorate %__slang_resource_heap{{.*}} Binding 4
-//MIX-NOT: OpDecorate %__slang_resource_heap{{.*}} Binding 7
//MIX-NOT: OpDecorate %__slang_resource_heap{{.*}} Binding 8
#ifdef SAMPLER
@@ -89,6 +89,8 @@ uniform RWBuffer<float>.Handle rwTexelBuffer;
#ifdef UNIFORM_BUFFER
//UNIFORM_BUFFER: OpDecorate %__slang_resource_heap{{.*}} Binding 6
//UNIFORM_BUFFER-NEXT: OpDecorate %__slang_resource_heap{{.*}} DescriptorSet 3
+//UNIFORM_BUFFER: OpDecorate %__slang_resource_heap{{.*}} Binding 7
+//UNIFORM_BUFFER-NEXT: OpDecorate %__slang_resource_heap{{.*}} DescriptorSet 3
struct Data
{
float v;