Mesa (master): glsl: Remove exec_list iterators now that nothing uses them.
Kenneth Graunke
kwg at kemper.freedesktop.org
Mon Jan 13 19:47:31 UTC 2014
Module: Mesa
Branch: master
Commit: 277dbf08b0e78fe6cff0fc751768a6f3d33e61f7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=277dbf08b0e78fe6cff0fc751768a6f3d33e61f7
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri Nov 22 03:42:06 2013 -0800
glsl: Remove exec_list iterators now that nothing uses them.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/glsl/ir.h | 24 ---------------------
src/glsl/list.h | 64 -------------------------------------------------------
2 files changed, 88 deletions(-)
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index aff6798..2ae8513 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -914,14 +914,6 @@ public:
}
/**
- * 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;
};
@@ -1521,14 +1505,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.
*/
const char *callee_name() const
diff --git a/src/glsl/list.h b/src/glsl/list.h
index f9eb60e..694b686 100644
--- 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
};
More information about the mesa-commit
mailing list