glsl: Change locations from yylloc to appropriate tokens positions.

[mesa.git] / src / glsl / opt_dead_code_local.cpp

diff --git a/src/glsl/opt_dead_code_local.cpp b/src/glsl/opt_dead_code_local.cpp
index 42a30b3d878b4a76d9811768e05faa4a521289dd..e7d46edbe3e9c68e8320b223a6242687a43c6437 100644 (file)
--- a/src/glsl/opt_dead_code_local.cpp
+++ b/src/glsl/opt_dead_code_local.cpp
@@ -70,8 +70,8 @@ public:
 
    void kill_channels(ir_variable *const var, int used)
    {
-      foreach_iter(exec_list_iterator, iter, *this->assignments) {
-        assignment_entry *entry = (assignment_entry *)iter.get();
+      foreach_list_safe(n, this->assignments) {
+        assignment_entry *entry = (assignment_entry *) n;
 
         if (entry->lhs == var) {
            if (var->type->is_scalar() || var->type->is_vector()) {
@@ -119,9 +119,9 @@ public:
       /* For the purpose of dead code elimination, emitting a vertex counts as
        * "reading" all of the currently assigned output variables.
        */
-      foreach_iter(exec_list_iterator, iter, *this->assignments) {
-         assignment_entry *entry = (assignment_entry *)iter.get();
-         if (entry->lhs->mode == ir_var_shader_out) {
+      foreach_list_safe(n, this->assignments) {
+         assignment_entry *entry = (assignment_entry *) n;
+         if (entry->lhs->data.mode == ir_var_shader_out) {
             if (debug)
                printf("kill %s\n", entry->lhs->name);
             entry->remove();
@@ -196,8 +196,8 @@ process_assignment(void *ctx, ir_assignment *ir, exec_list *assignments)
            printf("looking for %s.0x%01x to remove\n", var->name,
                   ir->write_mask);
 
-        foreach_iter(exec_list_iterator, iter, *assignments) {
-           assignment_entry *entry = (assignment_entry *)iter.get();
+        foreach_list_safe(n, assignments) {
+           assignment_entry *entry = (assignment_entry *) n;
 
            if (entry->lhs != var)
               continue;
@@ -258,8 +258,8 @@ process_assignment(void *ctx, ir_assignment *ir, exec_list *assignments)
          */
         if (debug)
            printf("looking for %s to remove\n", var->name);
-        foreach_iter(exec_list_iterator, iter, *assignments) {
-           assignment_entry *entry = (assignment_entry *)iter.get();
+        foreach_list_safe(n, assignments) {
+           assignment_entry *entry = (assignment_entry *) n;
 
            if (entry->lhs == var) {
               if (debug)
@@ -280,8 +280,8 @@ process_assignment(void *ctx, ir_assignment *ir, exec_list *assignments)
       printf("add %s\n", var->name);
 
       printf("current entries\n");
-      foreach_iter(exec_list_iterator, iter, *assignments) {
-        assignment_entry *entry = (assignment_entry *)iter.get();
+      foreach_list(n, assignments) {
+        assignment_entry *entry = (assignment_entry *) n;
 
         printf("    %s (0x%01x)\n", entry->lhs->name, entry->available);
       }