Merge pull request #42 from tfoleyNV/reflect-imported

Reflect imported code

1 files changed, 14 insertions, 3 deletions

diff --git a/source/slang/type-layout.cpp b/source/slang/type-layout.cpp
index 3427d6a6f..8b8a2b437 100644
--- a/source/slang/type-layout.cpp
+++ b/source/slang/type-layout.cpp
@@ -632,9 +632,20 @@ createParameterBlockTypeLayout(
     RefPtr<TypeLayout>          elementTypeLayout,
     LayoutRulesImpl*            rules)
 {
-    auto info = getParameterBlockLayoutInfo(
-        parameterBlockType,
-        rules);
+    SimpleLayoutInfo info;
+    if (parameterBlockType)
+    {
+        info = getParameterBlockLayoutInfo(
+            parameterBlockType,
+            rules);
+    }
+    else
+    {
+        // If there is no concrete type, then it seems like we are
+        // being asked to compute layout for the global scope
+        info = rules->GetObjectLayout(ShaderParameterKind::ConstantBuffer);
+    }
+ 
 
     auto typeLayout = new ParameterBlockTypeLayout();