summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorZack Rusin <zack@tungstengraphics.com>2008-02-26 00:18:54 -0500
committerZack Rusin <zack@tungstengraphics.com>2008-02-26 01:51:46 -0500
commite7985105695a18c29c13deb2b8f40c15eef72ee6 (patch)
tree6974204f4299b0bbb50a45e7c938ee17088b917c /src/gallium
parentbf1c2f3602038440ffacf7ae494cb4e9bacc9bb9 (diff)
add an explicit callback decleration and use it to silence warnings
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/auxiliary/cso_cache/cso_cache.c2
-rw-r--r--src/gallium/auxiliary/cso_cache/cso_cache.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/cso_cache/cso_cache.c b/src/gallium/auxiliary/cso_cache/cso_cache.c
index 1b870c8e41..f31042bce1 100644
--- a/src/gallium/auxiliary/cso_cache/cso_cache.c
+++ b/src/gallium/auxiliary/cso_cache/cso_cache.c
@@ -203,7 +203,7 @@ struct cso_cache *cso_cache_create(void)
}
void cso_for_each_state(struct cso_cache *sc, enum cso_cache_type type,
- void (*func)(void *state, void *user_data), void *user_data)
+ cso_state_callback func, void *user_data)
{
struct cso_hash *hash = 0;
struct cso_hash_iter iter;
diff --git a/src/gallium/auxiliary/cso_cache/cso_cache.h b/src/gallium/auxiliary/cso_cache/cso_cache.h
index 72a6b9d488..3b0fe100b8 100644
--- a/src/gallium/auxiliary/cso_cache/cso_cache.h
+++ b/src/gallium/auxiliary/cso_cache/cso_cache.h
@@ -138,6 +138,8 @@ enum cso_cache_type {
CSO_VERTEX_SHADER
};
+typedef void (*cso_state_callback)(void *, void *);
+
unsigned cso_construct_key(void *item, int item_size);
struct cso_cache *cso_cache_create(void);
@@ -152,7 +154,7 @@ struct cso_hash_iter cso_find_state_template(struct cso_cache *sc,
unsigned hash_key, enum cso_cache_type type,
void *templ);
void cso_for_each_state(struct cso_cache *sc, enum cso_cache_type type,
- void (*func)(void *state, void *user_data), void *user_data);
+ cso_state_callback func, void *user_data);
void * cso_take_state(struct cso_cache *sc, unsigned hash_key,
enum cso_cache_type type);