1 files changed, 43 insertions, 2 deletions
diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp
index e555ee6ca..a59f30a24 100644
--- a/tools/render-test/shader-input-layout.cpp
+++ b/tools/render-test/shader-input-layout.cpp
@@ -286,13 +286,54 @@ namespace renderer_test
                                 else if (parser.LookAhead("name"))
                                 {
                                     parser.ReadToken();
-                                    Token nameToken = parser.ReadToken();
 
+                                    // Optionally consume '=' 
+                                    if (parser.NextToken().Type == TokenType::OpAssign)
+                                    {
+                                        parser.ReadToken();
+                                    }
+
+                                    StringBuilder builder;
+
+                                    Token nameToken = parser.ReadToken();
                                     if (nameToken.Type != TokenType::Identifier)
                                     {
                                         throw TextFormatException("Invalid input syntax at line " + parser.NextToken().Position.Line);
                                     }
-                                    entry.name = nameToken.Content;
+                                    builder << nameToken.Content;
+
+                                    while (!parser.IsEnd())
+                                    {
+                                        Token token = parser.NextToken(0);
+
+                                        if (token.Type == TokenType::LBracket)
+                                        {
+                                            parser.ReadToken();
+                                            int index = parser.ReadInt();
+                                            SLANG_ASSERT(index >= 0);
+                                            parser.ReadMatchingToken(TokenType::RBracket);
+
+                                            builder << "[" << index << "]";
+                                        }
+                                        else if (token.Type == TokenType::Dot)
+                                        {
+                                            parser.ReadToken();
+                                            Token identifierToken = parser.ReadMatchingToken(TokenType::Identifier);
+
+                                            builder << "." << identifierToken.Content; 
+                                        }
+                                        else if (token.Type == TokenType::Comma)
+                                        {
+                                            // Break out
+                                            break;
+                                        }
+                                        else
+                                        {
+                                            throw TextFormatException("Invalid input syntax at line " + parser.NextToken().Position.Line);
+                                        }
+                                    }
+
+                                    entry.name = builder;
                                 }
 
                                 if (parser.LookAhead(","))