From bb8ebb4e75db0a19ed7643876bf646bdacb2726e Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Thu, 13 Jul 2017 09:50:27 -0700 Subject: An array of resources in Vulkan only consumes one binding Fixes #84 - When computing resource usage for an array type, don't multiply the resource usage of the element type by the element count foor descriptor-table-slot resources. - When reporting the "stride" of an array type through reflection, report the stride for descriptor table slots as zero, always. --- source/slang/reflection.cpp | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'source/slang/reflection.cpp') diff --git a/source/slang/reflection.cpp b/source/slang/reflection.cpp index 1beacc21b..3c89194c8 100644 --- a/source/slang/reflection.cpp +++ b/source/slang/reflection.cpp @@ -476,16 +476,28 @@ SLANG_API size_t spReflectionTypeLayout_GetElementStride(SlangReflectionTypeLayo if( auto arrayTypeLayout = dynamic_cast(typeLayout)) { - if(category == SLANG_PARAMETER_CATEGORY_UNIFORM) + switch (category) { + // We store the stride explictly for the uniform case + case SLANG_PARAMETER_CATEGORY_UNIFORM: return arrayTypeLayout->uniformStride; - } - else - { - auto elementTypeLayout = arrayTypeLayout->elementTypeLayout; - auto info = elementTypeLayout->FindResourceInfo(LayoutResourceKind(category)); - if(!info) return 0; - return info->count; + + // For most other cases (resource registers), the "stride" + // of an array is simply the number of resources (if any) + // consumed by its element type. + default: + { + auto elementTypeLayout = arrayTypeLayout->elementTypeLayout; + auto info = elementTypeLayout->FindResourceInfo(LayoutResourceKind(category)); + if(!info) return 0; + return info->count; + } + + // An import special case, though, is Vulkan descriptor-table slots, + // where an entire array will use a single `binding`, so that the + // effective stride is zero: + case SLANG_PARAMETER_CATEGORY_DESCRIPTOR_TABLE_SLOT: + return 0; } } -- cgit v1.2.3