[Mesa-dev] [PATCH 2/7] gallium/util: remove unused u_index_modify helpers

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

---
 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 e134894..5c4fc3c 100644
--- a/src/gallium/auxiliary/util/u_index_modify.c
+++ b/src/gallium/auxiliary/util/u_index_modify.c
@@ -51,47 +51,20 @@ void util_shorten_ubyte_elts_to_userptr(struct pipe_context *context,
     for (i = 0; i < count; i++) {
         *out_map = (unsigned short)(*in_map + index_bias);
         in_map++;
         out_map++;
     }
 
     if (src_transfer)
        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,
 					 struct pipe_index_buffer *ib,
 					 int index_bias,
 					 unsigned start, unsigned count,
 					 void *out)
 {
     struct pipe_transfer *in_transfer = NULL;
     const unsigned short *in_map;
@@ -111,46 +84,20 @@ void util_rebuild_ushort_elts_to_userptr(struct pipe_context *context,
     for (i = 0; i < count; i++) {
         *out_map = (unsigned short)(*in_map + index_bias);
         in_map++;
         out_map++;
     }
 
     if (in_transfer)
        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,
 				       struct pipe_index_buffer *ib,
 				       int index_bias,
 				       unsigned start, unsigned count,
 				       void *out)
 {
     struct pipe_transfer *in_transfer = NULL;
     const unsigned int *in_map;
@@ -169,35 +116,10 @@ void util_rebuild_uint_elts_to_userptr(struct pipe_context *context,
 
     for (i = 0; i < count; i++) {
         *out_map = (unsigned int)(*in_map + index_bias);
         in_map++;
         out_map++;
     }
 
     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 6afce50..1d34b12 100644
--- a/src/gallium/auxiliary/util/u_index_modify.h
+++ b/src/gallium/auxiliary/util/u_index_modify.h
@@ -27,46 +27,23 @@ struct pipe_context;
 struct pipe_resource;
 struct pipe_index_buffer;
 
 void util_shorten_ubyte_elts_to_userptr(struct pipe_context *context,
 					struct pipe_index_buffer *ib,
 					int index_bias,
 					unsigned start,
 					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.7.4