From df81b81fb91f45e6da0c504ee672d45829c41d06 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 23 Aug 2017 17:43:36 -0700 Subject: [PATCH] compiler/nir_types: Handle vectors in glsl_get_array_element Most of NIR doesn't allow doing array indexing on a vector (though it does on a matrix). However, nir_lower_io handles it just fine and this behavior is needed for shared variables in Vulkan. This commit makes glsl_get_array_element do something sensible for vector types and makes nir_validate happy with them. Reviewed-by: Lionel Landwerlin Reviewed-by: Iago Toral Quiroga --- src/compiler/nir_types.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp index b1b17ebd831..c66cfff8be1 100644 --- a/src/compiler/nir_types.cpp +++ b/src/compiler/nir_types.cpp @@ -39,6 +39,8 @@ glsl_get_array_element(const glsl_type* type) { if (type->is_matrix()) return type->column_type(); + else if (type->is_vector()) + return type->get_scalar_type(); return type->fields.array; } -- 2.30.2