From c714731653fb40d4e20cdfc98c3a200e836e2a21 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 17 May 2016 13:07:40 +1000 Subject: [PATCH] glsl: fix subroutine uniform .length(). This fixes .length() on subroutine uniform arrays, if we don't find the identifier normally, we look up the corresponding subroutine identifier instead. Fixes: GL45-CTS.shader_subroutine.arrays_of_arrays_of_uniforms GL45-CTS.shader_subroutine.arrayed_subroutine_uniforms Reviewed-by: Chris Forbes Signed-off-by: Dave Airlie --- src/compiler/glsl/ast_to_hir.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 434734d09af..ecd1327e358 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -1917,6 +1917,14 @@ ast_expression::do_hir(exec_list *instructions, ir_variable *var = state->symbols->get_variable(this->primary_expression.identifier); + if (var == NULL) { + /* the identifier might be a subroutine name */ + char *sub_name; + sub_name = ralloc_asprintf(ctx, "%s_%s", _mesa_shader_stage_to_subroutine_prefix(state->stage), this->primary_expression.identifier); + var = state->symbols->get_variable(sub_name); + ralloc_free(sub_name); + } + if (var != NULL) { var->data.used = true; result = new(ctx) ir_dereference_variable(var); -- 2.30.2