diff options
| author | Kenneth Graunke <[email protected]> | 2013-11-22 01:25:42 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-01-13 11:38:19 -0800 |
| commit | 5f7e778fa1b1e969a1b15e3650dec49b0026ed08 (patch) | |
| tree | 40bd6e3e5175ccd2ca49a783b7680ee2c947b775 /src/glsl/linker.cpp | |
| parent | fb6d9798a0c6eefd512f5b0f19eed34af8f4f257 (diff) | |
glsl: Convert piles of foreach_iter to the newer foreach_list macro.
foreach_iter and exec_list_iterators have been deprecated for some time now;
we just hadn't ever bothered to convert code to the newer foreach_list
and foreach_list_safe macros.
In these cases, we aren't editing the list, so we can use foreach_list
rather than foreach_list_safe.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/linker.cpp')
| -rw-r--r-- | src/glsl/linker.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index e820f0f9fc6..14e2ff61062 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -1338,9 +1338,8 @@ link_intrastage_shaders(void *mem_ctx, if (other == NULL) continue; - foreach_iter (exec_list_iterator, iter, *f) { - ir_function_signature *sig = - (ir_function_signature *) iter.get(); + foreach_list(n, &f->signatures) { + ir_function_signature *sig = (ir_function_signature *) n; if (!sig->is_defined || sig->is_builtin()) continue; @@ -1453,8 +1452,8 @@ link_intrastage_shaders(void *mem_ctx, if (linked->Stage == MESA_SHADER_GEOMETRY) { unsigned num_vertices = vertices_per_prim(prog->Geom.InputType); geom_array_resize_visitor input_resize_visitor(num_vertices, prog); - foreach_iter(exec_list_iterator, iter, *linked->ir) { - ir_instruction *ir = (ir_instruction *)iter.get(); + foreach_list(n, linked->ir) { + ir_instruction *ir = (ir_instruction *) n; ir->accept(&input_resize_visitor); } } |