diff options
| -rw-r--r-- | src/glsl/ir_variable_refcount.cpp | 14 | ||||
| -rw-r--r-- | src/glsl/ir_variable_refcount.h | 8 | ||||
| -rw-r--r-- | src/glsl/opt_dead_code.cpp | 2 | ||||
| -rw-r--r-- | src/glsl/opt_tree_grafting.cpp | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/glsl/ir_variable_refcount.cpp b/src/glsl/ir_variable_refcount.cpp index 7d39abb3682..1633a735744 100644 --- a/src/glsl/ir_variable_refcount.cpp +++ b/src/glsl/ir_variable_refcount.cpp @@ -36,7 +36,7 @@ // constructor -variable_entry::variable_entry(ir_variable *var) +ir_variable_refcount_entry::ir_variable_refcount_entry(ir_variable *var) { this->var = var; assign = NULL; @@ -46,17 +46,17 @@ variable_entry::variable_entry(ir_variable *var) } -variable_entry * +ir_variable_refcount_entry * ir_variable_refcount_visitor::get_variable_entry(ir_variable *var) { assert(var); foreach_iter(exec_list_iterator, iter, this->variable_list) { - variable_entry *entry = (variable_entry *)iter.get(); + ir_variable_refcount_entry *entry = (ir_variable_refcount_entry *)iter.get(); if (entry->var == var) return entry; } - variable_entry *entry = new(mem_ctx) variable_entry(var); + ir_variable_refcount_entry *entry = new(mem_ctx) ir_variable_refcount_entry(var); assert(entry->referenced_count == 0); this->variable_list.push_tail(entry); return entry; @@ -66,7 +66,7 @@ ir_variable_refcount_visitor::get_variable_entry(ir_variable *var) ir_visitor_status ir_variable_refcount_visitor::visit(ir_variable *ir) { - variable_entry *entry = this->get_variable_entry(ir); + ir_variable_refcount_entry *entry = this->get_variable_entry(ir); if (entry) entry->declaration = true; @@ -78,7 +78,7 @@ ir_visitor_status ir_variable_refcount_visitor::visit(ir_dereference_variable *ir) { ir_variable *const var = ir->variable_referenced(); - variable_entry *entry = this->get_variable_entry(var); + ir_variable_refcount_entry *entry = this->get_variable_entry(var); if (entry) entry->referenced_count++; @@ -101,7 +101,7 @@ ir_variable_refcount_visitor::visit_enter(ir_function_signature *ir) ir_visitor_status ir_variable_refcount_visitor::visit_leave(ir_assignment *ir) { - variable_entry *entry; + ir_variable_refcount_entry *entry; entry = this->get_variable_entry(ir->lhs->variable_referenced()); if (entry) { entry->assigned_count++; diff --git a/src/glsl/ir_variable_refcount.h b/src/glsl/ir_variable_refcount.h index 906135a9e1e..51a4945a135 100644 --- a/src/glsl/ir_variable_refcount.h +++ b/src/glsl/ir_variable_refcount.h @@ -33,10 +33,10 @@ #include "ir_visitor.h" #include "glsl_types.h" -class variable_entry : public exec_node +class ir_variable_refcount_entry : public exec_node { public: - variable_entry(ir_variable *var); + ir_variable_refcount_entry(ir_variable *var); ir_variable *var; /* The key: the variable's pointer. */ ir_assignment *assign; /* An assignment to the variable, if any */ @@ -69,9 +69,9 @@ public: virtual ir_visitor_status visit_enter(ir_function_signature *); virtual ir_visitor_status visit_leave(ir_assignment *); - variable_entry *get_variable_entry(ir_variable *var); + ir_variable_refcount_entry *get_variable_entry(ir_variable *var); - /* List of variable_entry */ + /* List of ir_variable_refcount_entry */ exec_list variable_list; void *mem_ctx; diff --git a/src/glsl/opt_dead_code.cpp b/src/glsl/opt_dead_code.cpp index 5b9546ad409..22c7af1c20a 100644 --- a/src/glsl/opt_dead_code.cpp +++ b/src/glsl/opt_dead_code.cpp @@ -50,7 +50,7 @@ do_dead_code(exec_list *instructions, bool uniform_locations_assigned) v.run(instructions); foreach_iter(exec_list_iterator, iter, v.variable_list) { - variable_entry *entry = (variable_entry *)iter.get(); + ir_variable_refcount_entry *entry = (ir_variable_refcount_entry *)iter.get(); /* Since each assignment is a reference, the refereneced count must be * greater than or equal to the assignment count. If they are equal, diff --git a/src/glsl/opt_tree_grafting.cpp b/src/glsl/opt_tree_grafting.cpp index d32d14e88a9..e2aff5f8071 100644 --- a/src/glsl/opt_tree_grafting.cpp +++ b/src/glsl/opt_tree_grafting.cpp @@ -349,7 +349,7 @@ tree_grafting_basic_block(ir_instruction *bb_first, lhs_var->mode == ir_var_inout) continue; - variable_entry *entry = info->refs->get_variable_entry(lhs_var); + ir_variable_refcount_entry *entry = info->refs->get_variable_entry(lhs_var); if (!entry->declaration || entry->assigned_count != 1 || |