From 686b7b1d48fea0ff62bdb177f9696316a02d2b07 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alejandro=20Pi=C3=B1eiro?= Date: Thu, 7 Mar 2019 16:57:10 +0100 Subject: [PATCH] nir/linker: fix ARRAY_SIZE query with xfb varyings For a non-array varying, it is expecting ARRAY_SIZE as 1, instead of 0. Reviewed-by: Timothy Arceri --- src/compiler/glsl/gl_nir_link_xfb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/glsl/gl_nir_link_xfb.c b/src/compiler/glsl/gl_nir_link_xfb.c index 587d65bfb37..7623492ba96 100644 --- a/src/compiler/glsl/gl_nir_link_xfb.c +++ b/src/compiler/glsl/gl_nir_link_xfb.c @@ -156,7 +156,8 @@ gl_nir_link_assign_xfb_resources(struct gl_context *ctx, varying->Name = NULL; varying->Type = glsl_get_gl_type(xfb_varying->type); varying->BufferIndex = buffer_index; - varying->Size = glsl_get_length(xfb_varying->type); + varying->Size = glsl_type_is_array(xfb_varying->type) ? + glsl_get_length(xfb_varying->type) : 1; varying->Offset = xfb_varying->offset; } -- 2.30.2