From 0f4b2a0a23650d8f773c53d84cb2ead1f6d4fc8e Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 25 Jan 2011 12:06:18 -0800 Subject: linker: Propagate max_array_access while linking functions Update the max_array_access of a global as functions that use that global are pulled into the linked shader. Fixes piglit test glsl-fs-implicit-array-size-01 and bugzilla #33219. NOTE: This is a candidate for the 7.9 and 7.10 branches. --- src/glsl/link_functions.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/glsl/link_functions.cpp') diff --git a/src/glsl/link_functions.cpp b/src/glsl/link_functions.cpp index 6207371..861fa39 100644 --- a/src/glsl/link_functions.cpp +++ b/src/glsl/link_functions.cpp @@ -181,6 +181,18 @@ public: var = ir->var->clone(linked, NULL); linked->symbols->add_variable(var); linked->ir->push_head(var); + } else if (var->type->is_array()) { + /* It is possible to have a global array declared in multiple + * shaders without a size. The array is implicitly sized by the + * maximal access to it in *any* shader. Because of this, we + * need to track the maximal access to the array as linking pulls + * more functions in that access the array. + */ + var->max_array_access = + MAX2(var->max_array_access, ir->var->max_array_access); + + if (var->type->length == 0 && ir->var->type->length != 0) + var->type = ir->var->type; } ir->var = var; -- cgit v1.1