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/type-layout.cpp | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'source/slang/type-layout.cpp') diff --git a/source/slang/type-layout.cpp b/source/slang/type-layout.cpp index 9bc001e88..2977ee9b8 100644 --- a/source/slang/type-layout.cpp +++ b/source/slang/type-layout.cpp @@ -1053,10 +1053,30 @@ SimpleLayoutInfo GetLayoutImpl( // The uniform case was already handled above if( elementResourceInfo.kind == LayoutResourceKind::Uniform ) continue; + + // In almost all cases, the resources consumed by an array + // will be its element count times the resources consumed + // by its element type. The one exception to this is + // arrays of resources in Vulkan GLSL, where an entire array + // only consumes a single descriptor-table slot. + // + // Note: We extend this logic to arbitrary arrays-of-structs, + // under the assumption that downstream legalization will + // turn those into scalarized structs-of-arrays and this + // logic will work out. + UInt arrayResourceCount = 0; + if (elementResourceInfo.kind == LayoutResourceKind::DescriptorTableSlot) + { + arrayResourceCount = elementResourceInfo.count; + } + else + { + arrayResourceCount = elementResourceInfo.count * elementCount; + } typeLayout->addResourceUsage( elementResourceInfo.kind, - elementResourceInfo.count * elementCount); + arrayResourceCount); } } return arrayUniformInfo; -- cgit v1.2.3