From 3d1b709676affbf4ce2810dacb9195d600c89117 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Wed, 23 Aug 2017 14:33:31 -0600
Subject: [PATCH] HLSL: Fix #1027.

---
 Test/hlsl.function.frag  | 2 +-
 hlsl/hlslParseHelper.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Test/hlsl.function.frag b/Test/hlsl.function.frag
index 4d116785..5834b319 100644
--- a/Test/hlsl.function.frag
+++ b/Test/hlsl.function.frag
@@ -8,7 +8,7 @@ uint fun2(float4 col)
     return 7;
 }
 
-float4 fun4(uint id1, uint id2)
+float4 fun4(uint id1, uniform uint id2)
 {
     return id1 * id2;
 }
diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp
index 5eb5e67a..9b54bbd8 100755
--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -6354,6 +6354,7 @@ void HlslParseContext::paramFix(TType& type)
         type.getQualifier().storage = EvqConstReadOnly;
         break;
     case EvqGlobal:
+    case EvqUniform:
     case EvqTemporary:
         type.getQualifier().storage = EvqIn;
         break;