fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-24 10:20:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

linker: Set sizes for non-global arrays as well

Browse source 
Previously only global arrays with implicit sizes would be patched.
This causes all arrays that are actually accessed to be sized.

Fixes piglit test glsl-fs-implicit-array-size-02.

NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit c87e9ef4d2)
This commit is contained in:
Ian Romanick 2011-01-25 12:04:08 -08:00
parent b51b8db450
commit bdcdcb5c18
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/glsl/linker.cpp
View file

@ -894,30 +894,29 @@ link_intrastage_shaders(void *mem_ctx,
free(linking_shaders);
/* Make a pass over all global variables to ensure that arrays with
/* Make a pass over all variable declarations to ensure that arrays with
* unspecified sizes have a size specified. The size is inferred from the
* max_array_access field.
*/
if (linked != NULL) {
foreach_list(node, linked->ir) {
ir_variable *const var = ((ir_instruction *) node)->as_variable();
class array_sizing_visitor : public ir_hierarchical_visitor {
public:
virtual ir_visitor_status visit(ir_variable *var)
{
if (var->type->is_array() && (var->type->length == 0)) {
const glsl_type *type =
glsl_type::get_array_instance(var->type->fields.array,
var->max_array_access);
if (var == NULL)
continue;
assert(type != NULL);
var->type = type;
}
if ((var->mode != ir_var_auto) && (var->mode != ir_var_temporary))
continue;
return visit_continue;
}
} v;
if (!var->type->is_array() || (var->type->length != 0))
continue;
const glsl_type *type =
glsl_type::get_array_instance(var->type->fields.array,
var->max_array_access);
assert(type != NULL);
var->type = type;
}
v.run(linked->ir);
}
return linked;