1 files changed, 38 insertions, 12 deletions
diff --git a/tools/gfx-util/shader-cursor.cpp b/tools/gfx-util/shader-cursor.cpp
index c2c34f5a5..b188901ec 100644
--- a/tools/gfx-util/shader-cursor.cpp
+++ b/tools/gfx-util/shader-cursor.cpp
@@ -145,19 +145,45 @@ Result ShaderCursor::getField(const char* name, const char* nameEnd, ShaderCurso
 ShaderCursor ShaderCursor::getElement(SlangInt index) const
 {
     // TODO: need to auto-dereference various buffer types...
-
-    if (m_typeLayout->getKind() == slang::TypeReflection::Kind::Array)
+    switch( m_typeLayout->getKind() )
     {
-        ShaderCursor elementCursor;
-        elementCursor.m_baseObject = m_baseObject;
-        elementCursor.m_typeLayout = m_typeLayout->getElementTypeLayout();
-        elementCursor.m_offset.uniformOffset =
-            m_offset.uniformOffset +
-            index * m_typeLayout->getElementStride(SLANG_PARAMETER_CATEGORY_UNIFORM);
-        elementCursor.m_offset.bindingRangeIndex = m_offset.bindingRangeIndex;
-        elementCursor.m_offset.bindingArrayIndex =
-            m_offset.bindingArrayIndex * m_typeLayout->getElementCount() + index;
-        return elementCursor;
+    case slang::TypeReflection::Kind::Array:
+        {
+            ShaderCursor elementCursor;
+            elementCursor.m_baseObject = m_baseObject;
+            elementCursor.m_typeLayout = m_typeLayout->getElementTypeLayout();
+            elementCursor.m_offset.uniformOffset =
+                m_offset.uniformOffset +
+                index * m_typeLayout->getElementStride(SLANG_PARAMETER_CATEGORY_UNIFORM);
+            elementCursor.m_offset.bindingRangeIndex = m_offset.bindingRangeIndex;
+            elementCursor.m_offset.bindingArrayIndex =
+                m_offset.bindingArrayIndex * m_typeLayout->getElementCount() + index;
+            return elementCursor;
+        }
+        break;
+
+    case slang::TypeReflection::Kind::Struct:
+        {
+            // The logic here is similar to `getField()` except that we don't
+            // need to look up the field index based on a name first.
+            //
+            auto fieldIndex = index;
+            slang::VariableLayoutReflection* fieldLayout =
+                m_typeLayout->getFieldByIndex((unsigned int)fieldIndex);
+            if(!fieldLayout)
+                return ShaderCursor();
+
+            ShaderCursor fieldCursor;
+            fieldCursor.m_baseObject = m_baseObject;
+            fieldCursor.m_typeLayout = fieldLayout->getTypeLayout();
+            fieldCursor.m_offset.uniformOffset = m_offset.uniformOffset + fieldLayout->getOffset();
+            fieldCursor.m_offset.bindingRangeIndex =
+                m_offset.bindingRangeIndex + m_typeLayout->getFieldBindingRangeOffset(fieldIndex);
+            fieldCursor.m_offset.bindingArrayIndex = m_offset.bindingArrayIndex;
+
+            return fieldCursor;
+        }
+        break;
     }
 
     return ShaderCursor();