From 42297c862f60ccecf794297ee97410f007bd75df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 15 Feb 2017 14:53:20 +0100 Subject: [PATCH] gallium/util: remove unused u_index_modify helpers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- src/gallium/auxiliary/util/u_index_modify.c | 78 --------------------- src/gallium/auxiliary/util/u_index_modify.h | 23 ------ 2 files changed, 101 deletions(-) diff --git a/src/gallium/auxiliary/util/u_index_modify.c b/src/gallium/auxiliary/util/u_index_modify.c index e13489482ae..5c4fc3c05d1 100644 --- a/src/gallium/auxiliary/util/u_index_modify.c +++ b/src/gallium/auxiliary/util/u_index_modify.c @@ -58,33 +58,6 @@ void util_shorten_ubyte_elts_to_userptr(struct pipe_context *context, pipe_buffer_unmap(context, src_transfer); } -void util_shorten_ubyte_elts(struct pipe_context *context, - struct pipe_index_buffer *ib, - struct pipe_resource **out_buf, - int index_bias, - unsigned start, - unsigned count) -{ - struct pipe_resource* new_elts; - unsigned short *out_map; - struct pipe_transfer *dst_transfer; - - new_elts = pipe_buffer_create(context->screen, - PIPE_BIND_INDEX_BUFFER, - PIPE_USAGE_DEFAULT, - 2 * count); - - out_map = pipe_buffer_map(context, new_elts, PIPE_TRANSFER_WRITE, - &dst_transfer); - util_shorten_ubyte_elts_to_userptr(context, ib, index_bias, - start, count, out_map); - pipe_buffer_unmap(context, dst_transfer); - - pipe_resource_reference(out_buf, NULL); - *out_buf = new_elts; -} - - /* Ushort indices. */ void util_rebuild_ushort_elts_to_userptr(struct pipe_context *context, @@ -118,32 +91,6 @@ void util_rebuild_ushort_elts_to_userptr(struct pipe_context *context, pipe_buffer_unmap(context, in_transfer); } -void util_rebuild_ushort_elts(struct pipe_context *context, - struct pipe_index_buffer *ib, - struct pipe_resource **out_buf, - int index_bias, - unsigned start, unsigned count) -{ - struct pipe_transfer *out_transfer = NULL; - struct pipe_resource *new_elts; - unsigned short *out_map; - - new_elts = pipe_buffer_create(context->screen, - PIPE_BIND_INDEX_BUFFER, - PIPE_USAGE_DEFAULT, - 2 * count); - - out_map = pipe_buffer_map(context, new_elts, - PIPE_TRANSFER_WRITE, &out_transfer); - util_rebuild_ushort_elts_to_userptr(context, ib, index_bias, - start, count, out_map); - pipe_buffer_unmap(context, out_transfer); - - pipe_resource_reference(out_buf, NULL); - *out_buf = new_elts; -} - - /* Uint indices. */ void util_rebuild_uint_elts_to_userptr(struct pipe_context *context, @@ -176,28 +123,3 @@ void util_rebuild_uint_elts_to_userptr(struct pipe_context *context, if (in_transfer) pipe_buffer_unmap(context, in_transfer); } - -void util_rebuild_uint_elts(struct pipe_context *context, - struct pipe_index_buffer *ib, - struct pipe_resource **out_buf, - int index_bias, - unsigned start, unsigned count) -{ - struct pipe_transfer *out_transfer = NULL; - struct pipe_resource *new_elts; - unsigned int *out_map; - - new_elts = pipe_buffer_create(context->screen, - PIPE_BIND_INDEX_BUFFER, - PIPE_USAGE_DEFAULT, - 2 * count); - - out_map = pipe_buffer_map(context, new_elts, - PIPE_TRANSFER_WRITE, &out_transfer); - util_rebuild_uint_elts_to_userptr(context, ib, index_bias, - start, count, out_map); - pipe_buffer_unmap(context, out_transfer); - - pipe_resource_reference(out_buf, NULL); - *out_buf = new_elts; -} diff --git a/src/gallium/auxiliary/util/u_index_modify.h b/src/gallium/auxiliary/util/u_index_modify.h index 6afce50b984..1d34b12e519 100644 --- a/src/gallium/auxiliary/util/u_index_modify.h +++ b/src/gallium/auxiliary/util/u_index_modify.h @@ -34,39 +34,16 @@ void util_shorten_ubyte_elts_to_userptr(struct pipe_context *context, unsigned count, void *out); -void util_shorten_ubyte_elts(struct pipe_context *context, - struct pipe_index_buffer *ib, - struct pipe_resource **out_buf, - int index_bias, - unsigned start, - unsigned count); - - - void util_rebuild_ushort_elts_to_userptr(struct pipe_context *context, struct pipe_index_buffer *ib, int index_bias, unsigned start, unsigned count, void *out); -void util_rebuild_ushort_elts(struct pipe_context *context, - struct pipe_index_buffer *ib, - struct pipe_resource **out_buf, - int index_bias, - unsigned start, unsigned count); - - - void util_rebuild_uint_elts_to_userptr(struct pipe_context *context, struct pipe_index_buffer *ib, int index_bias, unsigned start, unsigned count, void *out); -void util_rebuild_uint_elts(struct pipe_context *context, - struct pipe_index_buffer *ib, - struct pipe_resource **out_buf, - int index_bias, - unsigned start, unsigned count); - #endif -- 2.30.2