glsl: Remove exec_list iterators now that nothing uses them.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index aff679826e3e9f47f694591900354bab13fc7a9f..2ae8513a6a23ab3a12cf4c1649aebc8b1b5a50a4 100644 (file)
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -913,14 +913,6 @@ public:
       this->signatures.push_tail(sig);
    }
 
-   /**
-    * Get an iterator for the set of function signatures
-    */
-   exec_list_iterator iterator()
-   {
-      return signatures.iterator();
-   }
-
    /**
     * Find a signature that matches a set of actual parameters, taking implicit
     * conversions into account.  Also flags whether the match was exact.
@@ -1018,14 +1010,6 @@ public:
       return this;
    }
 
-   /**
-    * Get an iterator for the instructions of the loop body
-    */
-   exec_list_iterator iterator()
-   {
-      return body_instructions.iterator();
-   }
-
    /** List of ir_instruction that make up the body of the loop. */
    exec_list body_instructions;
 };
@@ -1520,14 +1504,6 @@ public:
 
    virtual ir_visitor_status accept(ir_hierarchical_visitor *);
 
-   /**
-    * Get an iterator for the set of acutal parameters
-    */
-   exec_list_iterator iterator()
-   {
-      return actual_parameters.iterator();
-   }
-
    /**
     * Get the name of the function being called.
     */

diff --git a/src/glsl/list.h b/src/glsl/list.h
index f9eb60ec7c4f07d6dbe428341d759252172cd5be..694b686b08c8dcc2ebe96011a722229590683178 100644 (file)
--- a/src/glsl/list.h
+++ b/src/glsl/list.h
@@ -206,62 +206,8 @@ struct exec_node {
 
 #ifdef __cplusplus
 struct exec_node;
-
-class iterator {
-public:
-   void next()
-   {
-   }
-
-   void *get()
-   {
-      return NULL;
-   }
-
-   bool has_next() const
-   {
-      return false;
-   }
-};
-
-class exec_list_iterator : public iterator {
-public:
-   exec_list_iterator(exec_node *n) : node(n), _next(n->next)
-   {
-      /* empty */
-   }
-
-   void next()
-   {
-      node = _next;
-      _next = node->next;
-   }
-
-   void remove()
-   {
-      node->remove();
-   }
-
-   exec_node *get()
-   {
-      return node;
-   }
-
-   bool has_next() const
-   {
-      return _next != NULL;
-   }
-
-private:
-   exec_node *node;
-   exec_node *_next;
-};
-
-#define foreach_iter(iter_type, iter, container) \
-   for (iter_type iter = (container) . iterator(); iter.has_next(); iter.next())
 #endif
 
-
 struct exec_list {
    struct exec_node *head;
    struct exec_node *tail;
@@ -404,16 +350,6 @@ struct exec_list {
        */
       source->make_empty();
    }
-
-   exec_list_iterator iterator()
-   {
-      return exec_list_iterator(head);
-   }
-
-   exec_list_iterator iterator() const
-   {
-      return exec_list_iterator((exec_node *) head);
-   }
 #endif
 };