diff options
Diffstat (limited to 'src/gallium/drivers/r600')
| -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 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 48b0fe97a6a..53640169949 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -173,7 +173,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) { @@ -263,7 +263,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 d7fa1b931b8..1deedf6cbf6 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -114,7 +114,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 559e75a8f11..bec31ffe9fd 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(&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)) { @@ -568,7 +568,7 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) if (rctx->chip_class < EVERGREEN) r600_update_sampler_states(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; @@ -676,7 +676,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, |