From: Eric Anholt <eric@anholt.net>
Date: Thu, 21 Jun 2018 23:39:15 +0000 (-0700)
Subject: glsl: Make sure that packed varyings reflect always_active_io properly.
X-Git-Tag: android-x86-8.1-r1~2574
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6bb046cd2952c7d862becf9960bfc48e4b8db0a4;p=android-x86%2Fexternal-mesa.git

glsl: Make sure that packed varyings reflect always_active_io properly.

The always_active_io flag was only set according to the first variable
that got packed in, so NIR io compaction would end up compacting XFB
varyings that shouldn't move at that point.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/compiler/glsl/lower_packed_varyings.cpp b/src/compiler/glsl/lower_packed_varyings.cpp
index 5c1eed719f2..5bd6c92ed99 100644
--- a/src/compiler/glsl/lower_packed_varyings.cpp
+++ b/src/compiler/glsl/lower_packed_varyings.cpp
@@ -729,12 +729,17 @@ lower_packed_varyings_visitor::get_packed_varying_deref(
       unpacked_var->insert_before(packed_var);
       this->packed_varyings[slot] = packed_var;
    } else {
+      ir_variable *var = this->packed_varyings[slot];
+
+      /* The slot needs to be marked as always active if any variable that got
+       * packed there was.
+       */
+      var->data.always_active_io |= unpacked_var->data.always_active_io;
+
       /* For geometry shader inputs, only update the packed variable name the
        * first time we visit each component.
        */
       if (this->gs_input_vertices == 0 || vertex_index == 0) {
-         ir_variable *var = this->packed_varyings[slot];
-
          if (var->is_name_ralloced())
             ralloc_asprintf_append((char **) &var->name, ",%s", name);
          else