Mesa (master): nir/xfb: do not use bare interface type

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 83f1b0e95b92339515cf1a0a37d1ad9da942825b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=83f1b0e95b92339515cf1a0a37d1ad9da942825b

Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Wed Apr 10 17:13:19 2019 +0200

nir/xfb: do not use bare interface type

In commit 3b3653c4cfb we decided not to use bare types; hence do not use
bare type when comparing with interface type to find out if the xfb
variable is an array block.

This fixes dEQP-VK.transform_feedback.* tests.

Fixes: 3b3653c4cfb ("nir/spirv: don't use bare types, remove assert in
                     split vars for testing")
CC: Dave Airlie <airlied at redhat.com>
CC: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/compiler/nir/nir_gather_xfb_info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_gather_xfb_info.c b/src/compiler/nir/nir_gather_xfb_info.c
index 962f4801a67..562bacbed62 100644
--- a/src/compiler/nir/nir_gather_xfb_info.c
+++ b/src/compiler/nir/nir_gather_xfb_info.c
@@ -231,7 +231,7 @@ nir_gather_xfb_info_with_varyings(const nir_shader *shader,
        */
       bool is_array_block = var->interface_type != NULL &&
          glsl_type_is_array(var->type) &&
-         glsl_without_array(var->type) == glsl_get_bare_type(var->interface_type);
+         glsl_without_array(var->type) == var->interface_type;
 
       if (var->data.explicit_offset && !is_array_block) {
          unsigned offset = var->data.offset;