Merge pull request #86 from tfoleyNV/resource-array-layout-fix

An array of resources in Vulkan only consumes one binding

2 files changed, 41 insertions, 9 deletions

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<ArrayTypeLayout*>(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;
         }
     }
 
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;