From 185ed2105829d6f5eb19edb9abbf0d7977e157c3 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 25 May 2012 09:44:53 -0600 Subject: draw: simplify index buffer specification Replace draw_set_index_buffer() and draw_set_mapped_index_buffer() with draw_set_indexes() which simply takes a pointer and an index size. --- src/gallium/drivers/llvmpipe/lp_draw_arrays.c | 8 +++++--- src/gallium/drivers/llvmpipe/lp_state_vertex.c | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gallium/drivers/llvmpipe') diff --git a/src/gallium/drivers/llvmpipe/lp_draw_arrays.c b/src/gallium/drivers/llvmpipe/lp_draw_arrays.c index 225b80e3dfb..96259d7144f 100644 --- a/src/gallium/drivers/llvmpipe/lp_draw_arrays.c +++ b/src/gallium/drivers/llvmpipe/lp_draw_arrays.c @@ -78,9 +78,11 @@ llvmpipe_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) mapped_indices = lp->index_buffer.user_buffer; if (!mapped_indices) mapped_indices = llvmpipe_resource_data(lp->index_buffer.buffer); - } - draw_set_mapped_index_buffer(draw, mapped_indices); + draw_set_indexes(draw, + (ubyte *) mapped_indices + lp->index_buffer.offset, + lp->index_buffer.index_size); + } llvmpipe_prepare_vertex_sampling(lp, lp->num_vertex_sampler_views, @@ -96,7 +98,7 @@ llvmpipe_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) draw_set_mapped_vertex_buffer(draw, i, NULL); } if (mapped_indices) { - draw_set_mapped_index_buffer(draw, NULL); + draw_set_indexes(draw, NULL, 0); } llvmpipe_cleanup_vertex_sampling(lp); diff --git a/src/gallium/drivers/llvmpipe/lp_state_vertex.c b/src/gallium/drivers/llvmpipe/lp_state_vertex.c index a62cfd55334..4a74cd7c9d4 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_vertex.c +++ b/src/gallium/drivers/llvmpipe/lp_state_vertex.c @@ -102,8 +102,6 @@ llvmpipe_set_index_buffer(struct pipe_context *pipe, memcpy(&llvmpipe->index_buffer, ib, sizeof(llvmpipe->index_buffer)); else memset(&llvmpipe->index_buffer, 0, sizeof(llvmpipe->index_buffer)); - - draw_set_index_buffer(llvmpipe->draw, ib); } void -- cgit v1.2.3