diff options
Diffstat (limited to 'src/glsl/link_functions.cpp')
| -rw-r--r-- | src/glsl/link_functions.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/glsl/link_functions.cpp b/src/glsl/link_functions.cpp index 05930edb80e..5851c14d624 100644 --- a/src/glsl/link_functions.cpp +++ b/src/glsl/link_functions.cpp @@ -21,14 +21,6 @@ * DEALINGS IN THE SOFTWARE. */ -#include <cstdlib> -#include <cstdio> -#include <cstdarg> - -extern "C" { -#include <talloc.h> -} - #include "main/core.h" #include "glsl_symbol_table.h" #include "glsl_parser_extras.h" @@ -185,6 +177,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; |