Merge pull request #807 from csyonghe/yong-fix2

 Fix type legalization to correctly handle nested empty struct fields

1 files changed, 13 insertions, 28 deletions

diff --git a/source/slang/legalize-types.cpp b/source/slang/legalize-types.cpp
index 858dbd95c..30590c02d 100644
--- a/source/slang/legalize-types.cpp
+++ b/source/slang/legalize-types.cpp
@@ -785,17 +785,15 @@ LegalType legalizeTypeImpl(
         auto legalElementType = legalizeType(context,
             uniformBufferType->getElementType());
 
-        switch (legalElementType.flavor)
-        {
-        case LegalType::Flavor::simple:
-            return LegalType::simple(type);
-
-        default:
-            return createLegalUniformBufferType(
+        // Note that even when legalElementType.flavor == Simple
+        // we still need to create a new uniform buffer type
+        // from `legalElementType` instead of `type`
+        // because the `legalElementType` may still differ from `type`
+        // if `type` contains empty structs.
+        return createLegalUniformBufferType(
                 context,
                 uniformBufferType,
                 legalElementType);
-        }
 
     }
     else if (isResourceType(type))
@@ -898,27 +896,14 @@ LegalType legalizeTypeImpl(
             context,
             arrayType->getElementType());
 
-        switch (legalElementType.flavor)
-        {
-        case LegalType::Flavor::simple:
-            // Element type didn't need to be legalized, so
-            // we can just use this type as-is.
-            return LegalType::simple(type);
-
-        default:
-            {
-                ArrayLegalTypeWrapper wrapper;
-                wrapper.arrayType = arrayType;
-
-                return wrapLegalType(
-                    context,
-                    legalElementType,
-                    &wrapper,
-                    &wrapper);
-            }
-            break;
-        }
+        ArrayLegalTypeWrapper wrapper;
+        wrapper.arrayType = arrayType;
 
+        return wrapLegalType(
+            context,
+            legalElementType,
+            &wrapper,
+            &wrapper);
     }
 
     return LegalType::simple(type);