From 83f1b0e95b92339515cf1a0a37d1ad9da942825b Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Wed, 10 Apr 2019 17:13:19 +0200 Subject: [PATCH] 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 CC: Jason Ekstrand Reviewed-by: Jason Ekstrand --- 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; -- 2.30.2