diff options
author | Marek Olšák <[email protected]> | 2011-11-22 20:43:21 +0100 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2011-11-22 20:56:51 +0100 |
commit | fba685a0995e76f86af5920163297e5c3b32fb4b (patch) | |
tree | c59f859813875dea474353fe91e088b445464ef7 /src/gallium/auxiliary/util | |
parent | 611a8b82e3827dd7c256edd5c014f4d48cb045f0 (diff) |
u_vbuf_mgr: rename to u_vbuf
Diffstat (limited to 'src/gallium/auxiliary/util')
-rw-r--r-- | src/gallium/auxiliary/util/u_vbuf.c (renamed from src/gallium/auxiliary/util/u_vbuf_mgr.c) | 24 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_vbuf.h (renamed from src/gallium/auxiliary/util/u_vbuf_mgr.h) | 22 |
2 files changed, 23 insertions, 23 deletions
diff --git a/src/gallium/auxiliary/util/u_vbuf_mgr.c b/src/gallium/auxiliary/util/u_vbuf.c index 83113f72d18..f6da9120343 100644 --- a/src/gallium/auxiliary/util/u_vbuf_mgr.c +++ b/src/gallium/auxiliary/util/u_vbuf.c @@ -25,7 +25,7 @@ * **************************************************************************/ -#include "util/u_vbuf_mgr.h" +#include "util/u_vbuf.h" #include "util/u_format.h" #include "util/u_inlines.h" @@ -55,7 +55,7 @@ struct u_vbuf_elements { }; struct u_vbuf_priv { - struct u_vbuf_mgr b; + struct u_vbuf b; struct pipe_context *pipe; struct translate_cache *translate_cache; @@ -113,7 +113,7 @@ static void u_vbuf_init_format_caps(struct u_vbuf_priv *mgr) 0, PIPE_BIND_VERTEX_BUFFER); } -struct u_vbuf_mgr * +struct u_vbuf * u_vbuf_create(struct pipe_context *pipe, unsigned upload_buffer_size, unsigned upload_buffer_alignment, @@ -138,7 +138,7 @@ u_vbuf_create(struct pipe_context *pipe, return &mgr->b; } -void u_vbuf_destroy(struct u_vbuf_mgr *mgrb) +void u_vbuf_destroy(struct u_vbuf *mgrb) { struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb; unsigned i; @@ -351,7 +351,7 @@ static void u_vbuf_translate_end(struct u_vbuf_priv *mgr) case PIPE_FORMAT_##what: format = PIPE_FORMAT_##withwhat; break struct u_vbuf_elements * -u_vbuf_create_vertex_elements(struct u_vbuf_mgr *mgrb, +u_vbuf_create_vertex_elements(struct u_vbuf *mgrb, unsigned count, const struct pipe_vertex_element *attribs, struct pipe_vertex_element *native_attribs) @@ -456,7 +456,7 @@ u_vbuf_create_vertex_elements(struct u_vbuf_mgr *mgrb, return ve; } -void u_vbuf_bind_vertex_elements(struct u_vbuf_mgr *mgrb, +void u_vbuf_bind_vertex_elements(struct u_vbuf *mgrb, void *cso, struct u_vbuf_elements *ve) { @@ -472,13 +472,13 @@ void u_vbuf_bind_vertex_elements(struct u_vbuf_mgr *mgrb, } } -void u_vbuf_destroy_vertex_elements(struct u_vbuf_mgr *mgr, +void u_vbuf_destroy_vertex_elements(struct u_vbuf *mgr, struct u_vbuf_elements *ve) { FREE(ve); } -void u_vbuf_set_vertex_buffers(struct u_vbuf_mgr *mgrb, +void u_vbuf_set_vertex_buffers(struct u_vbuf *mgrb, unsigned count, const struct pipe_vertex_buffer *bufs) { @@ -539,7 +539,7 @@ void u_vbuf_set_vertex_buffers(struct u_vbuf_mgr *mgrb, mgr->b.nr_real_vertex_buffers = count; } -void u_vbuf_set_index_buffer(struct u_vbuf_mgr *mgr, +void u_vbuf_set_index_buffer(struct u_vbuf *mgr, const struct pipe_index_buffer *ib) { if (ib && ib->buffer) { @@ -636,7 +636,7 @@ u_vbuf_upload_buffers(struct u_vbuf_priv *mgr, } } -unsigned u_vbuf_draw_max_vertex_count(struct u_vbuf_mgr *mgrb) +unsigned u_vbuf_draw_max_vertex_count(struct u_vbuf *mgrb) { struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb; unsigned i, nr = mgr->ve->count; @@ -816,7 +816,7 @@ static void u_vbuf_get_minmax_index(struct pipe_context *pipe, } enum u_vbuf_return_flags -u_vbuf_draw_begin(struct u_vbuf_mgr *mgrb, +u_vbuf_draw_begin(struct u_vbuf *mgrb, const struct pipe_draw_info *info) { struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb; @@ -858,7 +858,7 @@ u_vbuf_draw_begin(struct u_vbuf_mgr *mgrb, return U_VBUF_BUFFERS_UPDATED; } -void u_vbuf_draw_end(struct u_vbuf_mgr *mgrb) +void u_vbuf_draw_end(struct u_vbuf *mgrb) { struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb; diff --git a/src/gallium/auxiliary/util/u_vbuf_mgr.h b/src/gallium/auxiliary/util/u_vbuf.h index 42ca0ac35a4..57b93ddea6b 100644 --- a/src/gallium/auxiliary/util/u_vbuf_mgr.h +++ b/src/gallium/auxiliary/util/u_vbuf.h @@ -55,7 +55,7 @@ struct u_vbuf_caps { /* The manager. * This structure should also be used to access vertex buffers * from a driver. */ -struct u_vbuf_mgr { +struct u_vbuf { /* This is what was set in set_vertex_buffers. * May contain user buffers. */ struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS]; @@ -100,41 +100,41 @@ enum u_vbuf_return_flags { }; -struct u_vbuf_mgr * +struct u_vbuf * u_vbuf_create(struct pipe_context *pipe, unsigned upload_buffer_size, unsigned upload_buffer_alignment, unsigned upload_buffer_bind, enum u_fetch_alignment fetch_alignment); -void u_vbuf_destroy(struct u_vbuf_mgr *mgr); +void u_vbuf_destroy(struct u_vbuf *mgr); struct u_vbuf_elements * -u_vbuf_create_vertex_elements(struct u_vbuf_mgr *mgr, +u_vbuf_create_vertex_elements(struct u_vbuf *mgr, unsigned count, const struct pipe_vertex_element *attrs, struct pipe_vertex_element *native_attrs); -void u_vbuf_bind_vertex_elements(struct u_vbuf_mgr *mgr, +void u_vbuf_bind_vertex_elements(struct u_vbuf *mgr, void *cso, struct u_vbuf_elements *ve); -void u_vbuf_destroy_vertex_elements(struct u_vbuf_mgr *mgr, +void u_vbuf_destroy_vertex_elements(struct u_vbuf *mgr, struct u_vbuf_elements *ve); -void u_vbuf_set_vertex_buffers(struct u_vbuf_mgr *mgr, +void u_vbuf_set_vertex_buffers(struct u_vbuf *mgr, unsigned count, const struct pipe_vertex_buffer *bufs); -void u_vbuf_set_index_buffer(struct u_vbuf_mgr *mgr, +void u_vbuf_set_index_buffer(struct u_vbuf *mgr, const struct pipe_index_buffer *ib); -enum u_vbuf_return_flags u_vbuf_draw_begin(struct u_vbuf_mgr *mgr, +enum u_vbuf_return_flags u_vbuf_draw_begin(struct u_vbuf *mgr, const struct pipe_draw_info *info); -unsigned u_vbuf_draw_max_vertex_count(struct u_vbuf_mgr *mgr); +unsigned u_vbuf_draw_max_vertex_count(struct u_vbuf *mgr); -void u_vbuf_draw_end(struct u_vbuf_mgr *mgr); +void u_vbuf_draw_end(struct u_vbuf *mgr); static INLINE struct u_vbuf_resource *u_vbuf_resource(struct pipe_resource *r) |