commit d8edfd8e6641bab5590289f7694b508c0e4997ce
author rdb <rdb@users.noreply.github.com> Tue Jun 02 08:30:07 2020 +0200
committer GitHub <noreply@github.com> Tue Jun 02 00:30:07 2020 -0600
tree 7439bf8c2b04b5638c1278f6ebf1dfc22c293aa2
parent 999d4fdcddd3a0ca995a5aff5297831b8f5c4b06

HLSL: fix handling of uniform qualifier in entry point parameters (#2254)

* HLSL: Fix handling of uniforms in entry point parameters

* HLSL: fix handling of "uniform in"

* Tests: Update baseResults of hlsl.function.frag.out for #2254

* HLSL: fix uniforms in function parameters for opaque types

SPIRV/GlslangToSpv.cpp

diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 92cce81..e374020 100644
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -4389,8 +4389,10 @@
     assert(qualifier == glslang::EvqIn ||
            qualifier == glslang::EvqOut ||
            qualifier == glslang::EvqInOut ||
+           qualifier == glslang::EvqUniform ||
            qualifier == glslang::EvqConstReadOnly);
-    return qualifier != glslang::EvqConstReadOnly;
+    return qualifier != glslang::EvqConstReadOnly &&
+           qualifier != glslang::EvqUniform;
 }
 
 // Is parameter pass-by-original?