From 864c38ee72991f414f2478ccacb462bfb11b4bca Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@google.com>
Date: Fri, 25 Jan 2019 17:45:42 -0800
Subject: fix up empty-struct-parameters

---
 source/slang/ir-glsl-legalize.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'source/slang/ir-glsl-legalize.cpp')

diff --git a/source/slang/ir-glsl-legalize.cpp b/source/slang/ir-glsl-legalize.cpp
index 9c4210be0..d2b696c5b 100644
--- a/source/slang/ir-glsl-legalize.cpp
+++ b/source/slang/ir-glsl-legalize.cpp
@@ -567,7 +567,11 @@ ScalarizedVal createGLSLGlobalVaryingsImpl(
     UInt                        bindingIndex,
     GlobalVaryingDeclarator*    declarator)
 {
-    if( as<IRBasicType>(type) )
+    if (as<IRVoidType>(type))
+    {
+        return ScalarizedVal();
+    }
+    else if( as<IRBasicType>(type) )
     {
         return createSimpleGLSLGlobalVarying(
             context,
@@ -675,12 +679,14 @@ ScalarizedVal createGLSLGlobalVaryingsImpl(
                 stage,
                 fieldBindingIndex,
                 declarator);
+            if (fieldVal.flavor != ScalarizedVal::Flavor::none)
+            {
+                ScalarizedTupleValImpl::Element element;
+                element.val = fieldVal;
+                element.key = field->getKey();
 
-            ScalarizedTupleValImpl::Element element;
-            element.val = fieldVal;
-            element.key = field->getKey();
-
-            tupleValImpl->elements.Add(element);
+                tupleValImpl->elements.Add(element);
+            }
         }
 
         return ScalarizedVal::tuple(tupleValImpl);
-- 
cgit v1.2.3