summaryrefslogtreecommitdiffstats
path: root/src/glsl/opt_constant_variable.cpp
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2013-11-22 01:25:42 -0800
committerKenneth Graunke <kenneth@whitecape.org>2014-01-13 11:38:19 -0800
commit5f7e778fa1b1e969a1b15e3650dec49b0026ed08 (patch)
tree40bd6e3e5175ccd2ca49a783b7680ee2c947b775 /src/glsl/opt_constant_variable.cpp
parentfb6d9798a0c6eefd512f5b0f19eed34af8f4f257 (diff)
downloadexternal_mesa3d-5f7e778fa1b1e969a1b15e3650dec49b0026ed08.zip
external_mesa3d-5f7e778fa1b1e969a1b15e3650dec49b0026ed08.tar.gz
external_mesa3d-5f7e778fa1b1e969a1b15e3650dec49b0026ed08.tar.bz2
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 <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/opt_constant_variable.cpp')
-rw-r--r--src/glsl/opt_constant_variable.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/glsl/opt_constant_variable.cpp b/src/glsl/opt_constant_variable.cpp
index a026c51..22a0fe1 100644
--- a/src/glsl/opt_constant_variable.cpp
+++ b/src/glsl/opt_constant_variable.cpp
@@ -194,13 +194,12 @@ do_constant_variable_unlinked(exec_list *instructions)
{
bool progress = false;
- foreach_iter(exec_list_iterator, iter, *instructions) {
- ir_instruction *ir = (ir_instruction *)iter.get();
+ foreach_list(n, instructions) {
+ ir_instruction *ir = (ir_instruction *) n;
ir_function *f = ir->as_function();
if (f) {
- foreach_iter(exec_list_iterator, sigiter, *f) {
- ir_function_signature *sig =
- (ir_function_signature *) sigiter.get();
+ foreach_list(signode, &f->signatures) {
+ ir_function_signature *sig = (ir_function_signature *) signode;
if (do_constant_variable(&sig->body))
progress = true;
}