From 6b82e957be216ab3c55e1567f8a1329432e61267 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 27 Oct 2016 19:13:05 +1100 Subject: [PATCH] nir: add support for counting AoA uniforms in nir_shader_gather_info() Reviewed-by: Emil Velikov --- src/compiler/nir/nir_gather_info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c index 63c8a420fdf..82452b439a6 100644 --- a/src/compiler/nir/nir_gather_info.c +++ b/src/compiler/nir/nir_gather_info.c @@ -295,8 +295,8 @@ nir_shader_gather_info(nir_shader *shader, nir_function_impl *entrypoint) const struct glsl_type *type = var->type; unsigned count = 1; if (glsl_type_is_array(type)) { - count = glsl_get_length(type); - type = glsl_get_array_element(type); + count = glsl_get_aoa_size(type); + type = glsl_without_array(type); } if (glsl_type_is_image(type)) { -- 2.30.2