From: Samuel Iglesias Gonsálvez Date: Thu, 9 Nov 2017 10:15:03 +0000 (+0100) Subject: glsl: don't run intrastage array validation when the interface type is not an array X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fa8c1b92b7a8beb9ca2608c9b9bef23232214ae7;p=mesa.git glsl: don't run intrastage array validation when the interface type is not an array We validate that the interface block array type's definition matches. However, previously, the function could be called if an non-array interface block has different type definitions -for example, when the precision qualifier differs in a GLSL ES shader, we would create two different types-, and it would return invalid as both definitions are non-arrays. We fix this by specifying that at least one definition should be an array to call the validation. Signed-off-by: Samuel Iglesias Gonsálvez Reviewed-by: Nicolai Hähnle --- diff --git a/src/compiler/glsl/link_interface_blocks.cpp b/src/compiler/glsl/link_interface_blocks.cpp index c2c3b58f821..ce90d916075 100644 --- a/src/compiler/glsl/link_interface_blocks.cpp +++ b/src/compiler/glsl/link_interface_blocks.cpp @@ -137,7 +137,7 @@ intrastage_match(ir_variable *a, /* If a block is an array then it must match across the shader. * Unsized arrays are also processed and matched agaist sized arrays. */ - if (b->type != a->type && + if (b->type != a->type && (b->type->is_array() || a->type->is_array()) && (b->is_interface_instance() || a->is_interface_instance()) && !validate_intrastage_arrays(prog, b, a)) return false;