fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 16:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: move array_sizing_visitor class outside of link_intrastage_shaders()

Browse source 
To silence warnings with gcc 4.4.x on Linux and llvm-g++ 4.2 on Mac.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Brian Paul 2012-02-02 20:10:40 -07:00
parent 8cbe699c0d
commit 84a1273e7f
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/glsl/linker.cpp
View file

@ -855,6 +855,27 @@ get_main_function_signature(gl_shader *sh)
}
/**
* This class is only used in link_intrastage_shaders() below but declaring
* it inside that function leads to compiler warnings with some versions of
* gcc.
*/
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 + 1);
assert(type != NULL);
var->type = type;
}
return visit_continue;
}
};
/**
* Combine a group of shaders for a single stage to generate a linked shader
*
@ -1005,22 +1026,7 @@ link_intrastage_shaders(void *mem_ctx,
* max_array_access field.
*/
if (linked != NULL) {
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 + 1);
assert(type != NULL);
var->type = type;
}
return visit_continue;
}
} v;
array_sizing_visitor v;
v.run(linked->ir);
}