HLSL: Fix 1201: Accept 'layout' as an identifier.

fd1e8a78 · John Kessenich · 046bae0b · fd1e8a78 · fd1e8a78 · fd1e8a78
Commit fd1e8a78 authored Dec 29, 2017 by John Kessenich
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

hlsl.layout.frag.out Test/baseResults/hlsl.layout.frag.out +0 -0

hlsl.layout.frag Test/hlsl.layout.frag +2 -1

hlslGrammar.cpp hlsl/hlslGrammar.cpp +1 -0

No files found.
--- a/Test/baseResults/hlsl.layout.frag.out
+++ b/Test/baseResults/hlsl.layout.frag.out
--- a/Test/hlsl.layout.frag
+++ b/Test/hlsl.layout.frag
@@ -14,5 +14,6 @@ tbuffer tbufName2 : layout(set=4,binding=7) {
 float4 PixelShaderFunction(float4 input) : COLOR0
 {
-    return input + v1 + v5 + v1PostLayout;
+    float4 layout = 2.0;
+    return input + v1 + v5 + v1PostLayout * layout;
 }
--- a/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@ -4077,6 +4077,7 @@ const char* HlslGrammar::getTypeString(EHlslTokenClass tokenClass) const
    case EHTokMin16int:   return "min16int";
    case EHTokMin12int:   return "min12int";
    case EHTokConstantBuffer: return "ConstantBuffer";
+    case EHTokLayout:     return "layout";
    default:
        return nullptr;
    }