Mesa (staging/22.0): glsl: fix needs_lowering() call in varying packing pass

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 7d50ab809e1b8db6f9b49b137ab7b29e53e07bc8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d50ab809e1b8db6f9b49b137ab7b29e53e07bc8

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Wed Apr  6 12:47:52 2022 +1000

glsl: fix needs_lowering() call in varying packing pass

Here we remove the outer arrays on geom and tess shaders where
needed. Without this the pass can sometimes attempt to pack a
varying on only one side of the shader interface where it is not
actually needed. The result can be mismatching varying types.

Fixes: d6b9202873f0 ("glsl: disable varying packing when its not safe")

Tested-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Acked-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15761>
(cherry picked from commit 7d216f296afde47513b5f7f12e6675229e4adfd4)

---

 .pick_status.json                           |  2 +-
 src/compiler/glsl/lower_packed_varyings.cpp | 26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 0d9254d3b04..2b9c77885fa 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1908,7 +1908,7 @@
         "description": "glsl: fix needs_lowering() call in varying packing pass",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "d6b9202873f015174592e32f3325d00c57153d2d"
     },
     {
diff --git a/src/compiler/glsl/lower_packed_varyings.cpp b/src/compiler/glsl/lower_packed_varyings.cpp
index e95c804ea60..c5b44a7be9e 100644
--- a/src/compiler/glsl/lower_packed_varyings.cpp
+++ b/src/compiler/glsl/lower_packed_varyings.cpp
@@ -151,6 +151,24 @@
 #include "program/prog_instruction.h"
 #include "main/shader_types.h"
 
+static const glsl_type *
+get_varying_type(const ir_variable *var, gl_shader_stage stage)
+{
+   const glsl_type *type = var->type;
+
+   if (!var->data.patch &&
+       ((var->data.mode == ir_var_shader_out &&
+         stage == MESA_SHADER_TESS_CTRL) ||
+        (var->data.mode == ir_var_shader_in &&
+         (stage == MESA_SHADER_TESS_CTRL || stage == MESA_SHADER_TESS_EVAL ||
+          stage == MESA_SHADER_GEOMETRY)))) {
+      assert(type->is_array());
+      type = type->fields.array;
+   }
+
+   return type;
+}
+
 using namespace ir_builder;
 
 namespace {
@@ -192,7 +210,7 @@ private:
                                             ir_variable *unpacked_var,
                                             const char *name,
                                             unsigned vertex_index);
-   bool needs_lowering(ir_variable *var);
+   bool needs_lowering(ir_variable *var, gl_shader_stage stage);
 
    /**
     * Memory context used to allocate new instructions for the shader.
@@ -279,7 +297,7 @@ lower_packed_varyings_visitor::run(struct gl_linked_shader *shader)
 
       if (var->data.mode != this->mode ||
           var->data.location < VARYING_SLOT_VAR0 ||
-          !this->needs_lowering(var))
+          !this->needs_lowering(var, shader->Stage))
          continue;
 
       /* This lowering pass is only capable of packing floats and ints
@@ -780,7 +798,8 @@ lower_packed_varyings_visitor::get_packed_varying_deref(
 }
 
 bool
-lower_packed_varyings_visitor::needs_lowering(ir_variable *var)
+lower_packed_varyings_visitor::needs_lowering(ir_variable *var,
+                                              gl_shader_stage stage)
 {
    /* Things composed of vec4's, varyings with explicitly assigned
     * locations or varyings marked as must_be_shader_input (which might be used
@@ -790,6 +809,7 @@ lower_packed_varyings_visitor::needs_lowering(ir_variable *var)
       return false;
 
    const glsl_type *type = var->type;
+   type = get_varying_type(var, stage);
 
    /* Some drivers (e.g. panfrost) don't support packing of transform
     * feedback varyings.