HLSL: Fix #1106. Support shader setting of binding/set for $Global.

2017-10-19 16:54:25 -06:00
parent fe4e572c53
commit 1b46f137f7
9 changed files with 140 additions and 2 deletions
--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -1869,6 +1869,14 @@ void HlslParseContext::transferTypeAttributes(const TAttributeMap& attributes, T
    if (attributes.getInt(EatBinding, value, 1))
        type.getQualifier().layoutSet = value;

+    // global cbuffer binding
+    if (attributes.getInt(EatGlobalBinding, value))
+        globalUniformBinding = value;
+
+    // global cbuffer binding
+    if (attributes.getInt(EatGlobalBinding, value, 1))
+        globalUniformSet = value;
+
    // input attachment
    if (attributes.getInt(EatInputAttachment, value))
        type.getQualifier().layoutAttachment = value;