glsl: Fix lower_discard_flow prototype mismatch.

[mesa.git] / src / glsl / ir_variable_refcount.h

diff --git a/src/glsl/ir_variable_refcount.h b/src/glsl/ir_variable_refcount.h
index 30dd2bd587ee7d61ec7130124772a715b742f73e..51a4945a135289f23d4cefa7b12a301507844344 100644 (file)
--- a/src/glsl/ir_variable_refcount.h
+++ b/src/glsl/ir_variable_refcount.h
@@ -33,17 +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)
-   {
-      this->var = var;
-      assign = NULL;
-      referenced_count = 0;
-      assigned_count = 0;
-      declaration = false;
-   }
+   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 */
@@ -61,13 +54,13 @@ class ir_variable_refcount_visitor : public ir_hierarchical_visitor {
 public:
    ir_variable_refcount_visitor(void)
    {
-      this->mem_ctx = talloc_new(NULL);
+      this->mem_ctx = ralloc_context(NULL);
       this->variable_list.make_empty();
    }
 
    ~ir_variable_refcount_visitor(void)
    {
-      this->mem_ctx = talloc_new(NULL);
+      ralloc_free(this->mem_ctx);
    }
 
    virtual ir_visitor_status visit(ir_variable *);
@@ -76,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;