diff --git a/Test/hlsl.function.frag b/Test/hlsl.function.frag index 4d1167855ee8ffb466977ebcd1a845afacf8f16e..5834b319642f2f33de1d67c2625bb58bf7d2da86 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 5eb5e67acf7468f7d289427c85b645a798658357..9b54bbd8511c3d320f547dd47217894fff1e109e 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;