Ensure that shader_in and shader_out are correctly set in declarations

1 files changed, 19 insertions, 3 deletions

diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp
index 3414da00eb..dbc3666069 100644
--- a/ast_to_hir.cpp
+++ b/ast_to_hir.cpp
@@ -1471,11 +1471,27 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
 
    if (qual->uniform)
       var->shader_in = true;
-   if (qual->varying) {
-      if (qual->in)
+
+   /* Any 'in' or 'inout' variables at global scope must be marked as being
+    * shader inputs.  Likewise, any 'out' or 'inout' variables at global scope
+    * must be marked as being shader outputs.
+    */
+   if (state->current_function == NULL) {
+      switch (var->mode) {
+      case ir_var_in:
+      case ir_var_uniform:
+	 var->shader_in = true;
+	 break;
+      case ir_var_out:
+	 var->shader_out = true;
+	 break;
+      case ir_var_inout:
 	 var->shader_in = true;
-      if (qual->out)
 	 var->shader_out = true;
+	 break;
+      default:
+	 break;
+      }
    }
 
    if (qual->flat)