diff options
author | Marek Olšák <maraeo@gmail.com> | 2011-10-02 04:10:21 +0200 |
---|---|---|
committer | Marek Olšák <maraeo@gmail.com> | 2011-10-02 15:33:03 +0200 |
commit | 060e22c2128a738796f0f3f9bf123273bb63b902 (patch) | |
tree | b41240b9a300daabc9ca682be4e75c9c91977d7a | |
parent | 2330b7267c8561f12ca50913394bf5cbc053adc7 (diff) |
u_vbuf_mgr: s/u_vbuf_mgr_/u_vbuf_
(cherry picked from commit 28fb79891101c23c75982726c81112caa96f9275)
Conflicts:
src/gallium/auxiliary/util/u_vbuf_mgr.c
src/gallium/drivers/r600/r600_state_common.c
-rw-r--r-- | src/gallium/auxiliary/util/u_vbuf_mgr.c | 80 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_vbuf_mgr.h | 47 | ||||
-rw-r--r-- | src/gallium/drivers/r300/r300_context.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/r300/r300_context.h | 2 | ||||
-rw-r--r-- | src/gallium/drivers/r300/r300_render.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/r300/r300_state.c | 8 | ||||
-rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 2 | ||||
-rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 12 |
9 files changed, 81 insertions, 82 deletions
diff --git a/src/gallium/auxiliary/util/u_vbuf_mgr.c b/src/gallium/auxiliary/util/u_vbuf_mgr.c index 760bf6be31c..a78f06351e1 100644 --- a/src/gallium/auxiliary/util/u_vbuf_mgr.c +++ b/src/gallium/auxiliary/util/u_vbuf_mgr.c @@ -49,7 +49,7 @@ struct u_vbuf_caps { unsigned fetch_dword_unaligned:1; }; -struct u_vbuf_mgr_elements { +struct u_vbuf_elements { unsigned count; struct pipe_vertex_element ve[PIPE_MAX_ATTRIBS]; @@ -67,7 +67,7 @@ struct u_vbuf_mgr_elements { boolean incompatible_layout; }; -struct u_vbuf_mgr_priv { +struct u_vbuf_priv { struct u_vbuf_mgr b; struct u_vbuf_caps caps; struct pipe_context *pipe; @@ -75,7 +75,7 @@ struct u_vbuf_mgr_priv { struct translate_cache *translate_cache; unsigned translate_vb_slot; - struct u_vbuf_mgr_elements *ve; + struct u_vbuf_elements *ve; void *saved_ve, *fallback_ve; boolean ve_binding_lock; @@ -83,7 +83,7 @@ struct u_vbuf_mgr_priv { boolean incompatible_vb_layout; }; -static void u_vbuf_mgr_init_format_caps(struct u_vbuf_mgr_priv *mgr) +static void u_vbuf_init_format_caps(struct u_vbuf_priv *mgr) { struct pipe_screen *screen = mgr->pipe->screen; @@ -113,13 +113,13 @@ static void u_vbuf_mgr_init_format_caps(struct u_vbuf_mgr_priv *mgr) } struct u_vbuf_mgr * -u_vbuf_mgr_create(struct pipe_context *pipe, - unsigned upload_buffer_size, - unsigned upload_buffer_alignment, - unsigned upload_buffer_bind, - enum u_fetch_alignment fetch_alignment) +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) { - struct u_vbuf_mgr_priv *mgr = CALLOC_STRUCT(u_vbuf_mgr_priv); + struct u_vbuf_priv *mgr = CALLOC_STRUCT(u_vbuf_priv); mgr->pipe = pipe; mgr->translate_cache = translate_cache_create(); @@ -131,14 +131,14 @@ u_vbuf_mgr_create(struct pipe_context *pipe, mgr->caps.fetch_dword_unaligned = fetch_alignment == U_VERTEX_FETCH_BYTE_ALIGNED; - u_vbuf_mgr_init_format_caps(mgr); + u_vbuf_init_format_caps(mgr); return &mgr->b; } -void u_vbuf_mgr_destroy(struct u_vbuf_mgr *mgrb) +void u_vbuf_destroy(struct u_vbuf_mgr *mgrb) { - struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb; + struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb; unsigned i; for (i = 0; i < mgr->b.nr_vertex_buffers; i++) { @@ -155,7 +155,7 @@ void u_vbuf_mgr_destroy(struct u_vbuf_mgr *mgrb) static enum u_vbuf_return_flags -u_vbuf_translate_begin(struct u_vbuf_mgr_priv *mgr, +u_vbuf_translate_begin(struct u_vbuf_priv *mgr, int min_index, int max_index) { struct translate_key key; @@ -315,7 +315,7 @@ u_vbuf_translate_begin(struct u_vbuf_mgr_priv *mgr, return upload_flushed ? U_VBUF_UPLOAD_FLUSHED : 0; } -static void u_vbuf_translate_end(struct u_vbuf_mgr_priv *mgr) +static void u_vbuf_translate_end(struct u_vbuf_priv *mgr) { if (mgr->fallback_ve == NULL) { return; @@ -336,15 +336,15 @@ static void u_vbuf_translate_end(struct u_vbuf_mgr_priv *mgr) #define FORMAT_REPLACE(what, withwhat) \ case PIPE_FORMAT_##what: format = PIPE_FORMAT_##withwhat; break -struct u_vbuf_mgr_elements * -u_vbuf_mgr_create_vertex_elements(struct u_vbuf_mgr *mgrb, - unsigned count, - const struct pipe_vertex_element *attribs, - struct pipe_vertex_element *native_attribs) +struct u_vbuf_elements * +u_vbuf_create_vertex_elements(struct u_vbuf_mgr *mgrb, + unsigned count, + const struct pipe_vertex_element *attribs, + struct pipe_vertex_element *native_attribs) { - struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb; + struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb; unsigned i; - struct u_vbuf_mgr_elements *ve = CALLOC_STRUCT(u_vbuf_mgr_elements); + struct u_vbuf_elements *ve = CALLOC_STRUCT(u_vbuf_elements); ve->count = count; @@ -440,11 +440,11 @@ u_vbuf_mgr_create_vertex_elements(struct u_vbuf_mgr *mgrb, return ve; } -void u_vbuf_mgr_bind_vertex_elements(struct u_vbuf_mgr *mgrb, - void *cso, - struct u_vbuf_mgr_elements *ve) +void u_vbuf_bind_vertex_elements(struct u_vbuf_mgr *mgrb, + void *cso, + struct u_vbuf_elements *ve) { - struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb; + struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb; if (!cso) { return; @@ -456,17 +456,17 @@ void u_vbuf_mgr_bind_vertex_elements(struct u_vbuf_mgr *mgrb, } } -void u_vbuf_mgr_destroy_vertex_elements(struct u_vbuf_mgr *mgr, - struct u_vbuf_mgr_elements *ve) +void u_vbuf_destroy_vertex_elements(struct u_vbuf_mgr *mgr, + struct u_vbuf_elements *ve) { FREE(ve); } -void u_vbuf_mgr_set_vertex_buffers(struct u_vbuf_mgr *mgrb, - unsigned count, - const struct pipe_vertex_buffer *bufs) +void u_vbuf_set_vertex_buffers(struct u_vbuf_mgr *mgrb, + unsigned count, + const struct pipe_vertex_buffer *bufs) { - struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb; + struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb; unsigned i; mgr->any_user_vbs = FALSE; @@ -521,7 +521,7 @@ void u_vbuf_mgr_set_vertex_buffers(struct u_vbuf_mgr *mgrb, } static enum u_vbuf_return_flags -u_vbuf_upload_buffers(struct u_vbuf_mgr_priv *mgr, +u_vbuf_upload_buffers(struct u_vbuf_priv *mgr, int min_index, int max_index, unsigned instance_count) { @@ -577,7 +577,7 @@ u_vbuf_upload_buffers(struct u_vbuf_mgr_priv *mgr, return retval; } -static void u_vbuf_mgr_compute_max_index(struct u_vbuf_mgr_priv *mgr) +static void u_vbuf_compute_max_index(struct u_vbuf_priv *mgr) { unsigned i, nr = mgr->ve->count; @@ -618,14 +618,14 @@ static void u_vbuf_mgr_compute_max_index(struct u_vbuf_mgr_priv *mgr) } enum u_vbuf_return_flags -u_vbuf_mgr_draw_begin(struct u_vbuf_mgr *mgrb, - const struct pipe_draw_info *info) +u_vbuf_draw_begin(struct u_vbuf_mgr *mgrb, + const struct pipe_draw_info *info) { - struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb; + struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb; int min_index, max_index; enum u_vbuf_return_flags retval = 0; - u_vbuf_mgr_compute_max_index(mgr); + u_vbuf_compute_max_index(mgr); min_index = info->min_index - info->index_bias; if (info->max_index == ~0) { @@ -652,9 +652,9 @@ u_vbuf_mgr_draw_begin(struct u_vbuf_mgr *mgrb, return retval; } -void u_vbuf_mgr_draw_end(struct u_vbuf_mgr *mgrb) +void u_vbuf_draw_end(struct u_vbuf_mgr *mgrb) { - struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb; + struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb; if (mgr->fallback_ve) { u_vbuf_translate_end(mgr); diff --git a/src/gallium/auxiliary/util/u_vbuf_mgr.h b/src/gallium/auxiliary/util/u_vbuf_mgr.h index e99aaec0ce8..898ecfca586 100644 --- a/src/gallium/auxiliary/util/u_vbuf_mgr.h +++ b/src/gallium/auxiliary/util/u_vbuf_mgr.h @@ -71,7 +71,7 @@ struct u_vbuf_resource { }; /* Opaque type containing information about vertex elements for the manager. */ -struct u_vbuf_mgr_elements; +struct u_vbuf_elements; enum u_fetch_alignment { U_VERTEX_FETCH_BYTE_ALIGNED, @@ -85,36 +85,35 @@ enum u_vbuf_return_flags { struct u_vbuf_mgr * -u_vbuf_mgr_create(struct pipe_context *pipe, - unsigned upload_buffer_size, - unsigned upload_buffer_alignment, - unsigned upload_buffer_bind, - enum u_fetch_alignment fetch_alignment); +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_mgr_destroy(struct u_vbuf_mgr *mgr); +void u_vbuf_destroy(struct u_vbuf_mgr *mgr); -struct u_vbuf_mgr_elements * -u_vbuf_mgr_create_vertex_elements(struct u_vbuf_mgr *mgr, - unsigned count, - const struct pipe_vertex_element *attrs, - struct pipe_vertex_element *native_attrs); +struct u_vbuf_elements * +u_vbuf_create_vertex_elements(struct u_vbuf_mgr *mgr, + unsigned count, + const struct pipe_vertex_element *attrs, + struct pipe_vertex_element *native_attrs); -void u_vbuf_mgr_bind_vertex_elements(struct u_vbuf_mgr *mgr, - void *cso, - struct u_vbuf_mgr_elements *ve); +void u_vbuf_bind_vertex_elements(struct u_vbuf_mgr *mgr, + void *cso, + struct u_vbuf_elements *ve); -void u_vbuf_mgr_destroy_vertex_elements(struct u_vbuf_mgr *mgr, - struct u_vbuf_mgr_elements *ve); +void u_vbuf_destroy_vertex_elements(struct u_vbuf_mgr *mgr, + struct u_vbuf_elements *ve); -void u_vbuf_mgr_set_vertex_buffers(struct u_vbuf_mgr *mgr, - unsigned count, - const struct pipe_vertex_buffer *bufs); +void u_vbuf_set_vertex_buffers(struct u_vbuf_mgr *mgr, + unsigned count, + const struct pipe_vertex_buffer *bufs); -enum u_vbuf_return_flags -u_vbuf_mgr_draw_begin(struct u_vbuf_mgr *mgr, - const struct pipe_draw_info *info); +enum u_vbuf_return_flags u_vbuf_draw_begin(struct u_vbuf_mgr *mgr, + const struct pipe_draw_info *info); -void u_vbuf_mgr_draw_end(struct u_vbuf_mgr *mgr); +void u_vbuf_draw_end(struct u_vbuf_mgr *mgr); static INLINE struct u_vbuf_resource *u_vbuf_resource(struct pipe_resource *r) diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c index 0554c40eef0..b8a250d309b 100644 --- a/src/gallium/drivers/r300/r300_context.c +++ b/src/gallium/drivers/r300/r300_context.c @@ -106,7 +106,7 @@ static void r300_destroy_context(struct pipe_context* context) draw_destroy(r300->draw); if (r300->vbuf_mgr) - u_vbuf_mgr_destroy(r300->vbuf_mgr); + u_vbuf_destroy(r300->vbuf_mgr); /* XXX: This function assumes r300->query_list was initialized */ r300_release_referenced_objects(r300); @@ -437,7 +437,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen, r300_init_state_functions(r300); r300_init_resource_functions(r300); - r300->vbuf_mgr = u_vbuf_mgr_create(&r300->context, 1024 * 1024, 16, + r300->vbuf_mgr = u_vbuf_create(&r300->context, 1024 * 1024, 16, PIPE_BIND_VERTEX_BUFFER | PIPE_BIND_INDEX_BUFFER, U_VERTEX_FETCH_DWORD_ALIGNED); diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h index d71db0001a9..60cbe1a40f5 100644 --- a/src/gallium/drivers/r300/r300_context.h +++ b/src/gallium/drivers/r300/r300_context.h @@ -425,7 +425,7 @@ struct r300_vertex_element_state { struct pipe_vertex_element velem[PIPE_MAX_ATTRIBS]; unsigned format_size[PIPE_MAX_ATTRIBS]; - struct u_vbuf_mgr_elements *vmgr_elements; + struct u_vbuf_elements *vmgr_elements; /* The size of the vertex, in dwords. */ unsigned vertex_size_dwords; diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c index 293ac3d101f..535bdaf313f 100644 --- a/src/gallium/drivers/r300/r300_render.c +++ b/src/gallium/drivers/r300/r300_render.c @@ -779,7 +779,7 @@ static void r300_draw_vbo(struct pipe_context* pipe, r300_update_derived_state(r300); /* Start the vbuf manager and update buffers if needed. */ - if (u_vbuf_mgr_draw_begin(r300->vbuf_mgr, &info) & U_VBUF_BUFFERS_UPDATED) { + if (u_vbuf_draw_begin(r300->vbuf_mgr, &info) & U_VBUF_BUFFERS_UPDATED) { r300->vertex_arrays_dirty = TRUE; } @@ -810,7 +810,7 @@ static void r300_draw_vbo(struct pipe_context* pipe, } } - u_vbuf_mgr_draw_end(r300->vbuf_mgr); + u_vbuf_draw_end(r300->vbuf_mgr); } /**************************************************************************** diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 057cd9faf03..11282a45e0f 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -1583,7 +1583,7 @@ static void r300_set_vertex_buffers(struct pipe_context* pipe, count = 1; } - u_vbuf_mgr_set_vertex_buffers(r300->vbuf_mgr, count, buffers); + u_vbuf_set_vertex_buffers(r300->vbuf_mgr, count, buffers); if (r300->screen->caps.has_tcl) { /* HW TCL. */ @@ -1691,7 +1691,7 @@ static void* r300_create_vertex_elements_state(struct pipe_context* pipe, velems->count = count; velems->vmgr_elements = - u_vbuf_mgr_create_vertex_elements(r300->vbuf_mgr, count, attribs, + u_vbuf_create_vertex_elements(r300->vbuf_mgr, count, attribs, velems->velem); if (r300_screen(pipe->screen)->caps.has_tcl) { @@ -1721,7 +1721,7 @@ static void r300_bind_vertex_elements_state(struct pipe_context *pipe, r300->velems = velems; - u_vbuf_mgr_bind_vertex_elements(r300->vbuf_mgr, state, velems->vmgr_elements); + u_vbuf_bind_vertex_elements(r300->vbuf_mgr, state, velems->vmgr_elements); if (r300->draw) { draw_set_vertex_elements(r300->draw, velems->count, velems->velem); @@ -1738,7 +1738,7 @@ static void r300_delete_vertex_elements_state(struct pipe_context *pipe, void *s struct r300_context *r300 = r300_context(pipe); struct r300_vertex_element_state *velems = state; - u_vbuf_mgr_destroy_vertex_elements(r300->vbuf_mgr, velems->vmgr_elements); + u_vbuf_destroy_vertex_elements(r300->vbuf_mgr, velems->vmgr_elements); FREE(state); } diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 8f3a175587e..9f0d375bbd6 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -171,7 +171,7 @@ static void r600_destroy_context(struct pipe_context *context) free(rctx->states[i]); } - u_vbuf_mgr_destroy(rctx->vbuf_mgr); + u_vbuf_destroy(rctx->vbuf_mgr); util_slab_destroy(&rctx->pool_transfers); if (rctx->fences.bo) { @@ -274,7 +274,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void sizeof(struct pipe_transfer), 64, UTIL_SLAB_SINGLETHREADED); - rctx->vbuf_mgr = u_vbuf_mgr_create(&rctx->context, 1024 * 1024, 256, + rctx->vbuf_mgr = u_vbuf_create(&rctx->context, 1024 * 1024, 256, PIPE_BIND_VERTEX_BUFFER | PIPE_BIND_INDEX_BUFFER | PIPE_BIND_CONSTANT_BUFFER, diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 2667c80bcef..8ad6895e327 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -110,7 +110,7 @@ struct r600_vertex_element { unsigned count; struct pipe_vertex_element elements[PIPE_MAX_ATTRIBS]; - struct u_vbuf_mgr_elements *vmgr_elements; + struct u_vbuf_elements *vmgr_elements; struct r600_bo *fetch_shader; unsigned fs_size; struct r600_pipe_state rstate; diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 1c1ca54cab4..f86307c217c 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -162,7 +162,7 @@ void r600_bind_vertex_elements(struct pipe_context *ctx, void *state) rctx->vertex_elements = v; if (v) { - u_vbuf_mgr_bind_vertex_elements(rctx->vbuf_mgr, state, + u_vbuf_bind_vertex_elements(rctx->vbuf_mgr, state, v->vmgr_elements); rctx->states[v->rstate.id] = &v->rstate; @@ -182,7 +182,7 @@ void r600_delete_vertex_element(struct pipe_context *ctx, void *state) rctx->vertex_elements = NULL; r600_bo_reference(rctx->radeon, &v->fetch_shader, NULL); - u_vbuf_mgr_destroy_vertex_elements(rctx->vbuf_mgr, v->vmgr_elements); + u_vbuf_destroy_vertex_elements(rctx->vbuf_mgr, v->vmgr_elements); FREE(state); } @@ -227,7 +227,7 @@ void r600_set_vertex_buffers(struct pipe_context *ctx, unsigned count, } } - u_vbuf_mgr_set_vertex_buffers(rctx->vbuf_mgr, count, buffers); + u_vbuf_set_vertex_buffers(rctx->vbuf_mgr, count, buffers); } void *r600_create_vertex_elements(struct pipe_context *ctx, @@ -243,7 +243,7 @@ void *r600_create_vertex_elements(struct pipe_context *ctx, v->count = count; v->vmgr_elements = - u_vbuf_mgr_create_vertex_elements(rctx->vbuf_mgr, count, + u_vbuf_create_vertex_elements(rctx->vbuf_mgr, count, elements, v->elements); if (r600_vertex_elements_build_fetch_shader(rctx, v)) { @@ -565,7 +565,7 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) if (rctx->have_depth_fb || rctx->have_depth_texture) r600_flush_depth_textures(rctx); } - u_vbuf_mgr_draw_begin(rctx->vbuf_mgr, info); + u_vbuf_draw_begin(rctx->vbuf_mgr, info); r600_vertex_buffer_update(rctx); draw.info = *info; @@ -669,7 +669,7 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) pipe_resource_reference(&draw.index_buffer, NULL); - u_vbuf_mgr_draw_end(rctx->vbuf_mgr); + u_vbuf_draw_end(rctx->vbuf_mgr); } void _r600_pipe_state_add_reg(struct r600_context *ctx, |