radeonsi: inline si_translate_index_buffer

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>

diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources
index c24eb75194b8eb3684b0d2fbd7b98d5ac52744cc..4e1f9712efc68a413ccc4166943a7e720b4d0ddb 100644 (file)
--- a/src/gallium/drivers/radeonsi/Makefile.sources
+++ b/src/gallium/drivers/radeonsi/Makefile.sources
@@ -10,5 +10,4 @@ C_SOURCES := \
        si_shader.c \
        si_state.c \
        si_state_draw.c \
-       si_translate.c \
        si_uvd.c

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index bb4d82a9ad4b1527532e258a1b942a1c784b9f92..fc75854a83d478dab2c75d43d7edd8b5bf2b6487 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -165,11 +165,6 @@ void si_decompress_color_textures(struct si_context *sctx,
 void si_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence,
               unsigned flags);
 
-/* si_translate.c */
-void si_translate_index_buffer(struct si_context *sctx,
-                              struct pipe_index_buffer *ib,
-                              unsigned count);
-
 #if SI_TRACE_CS
 void si_trace_emit(struct si_context *sctx);
 #endif

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index f325a64040b261d713f108c37103494f9505de69..8dbf373d5f0fe98d91dccb5e47ad0ec5ab5d2015 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -27,6 +27,8 @@
 #include "util/u_memory.h"
 #include "util/u_framebuffer.h"
 #include "util/u_blitter.h"
+#include "util/u_index_modify.h"
+#include "util/u_upload_mgr.h"
 #include "tgsi/tgsi_parse.h"
 #include "si_pipe.h"
 #include "si_shader.h"
@@ -718,7 +720,23 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
                ib.offset = sctx->index_buffer.offset + info->start * ib.index_size;
 
                /* Translate or upload, if needed. */
-               si_translate_index_buffer(sctx, &ib, info->count);
+               if (ib.index_size == 1) {
+                       struct pipe_resource *out_buffer = NULL;
+                       unsigned out_offset;
+                       void *ptr;
+
+                       u_upload_alloc(sctx->b.uploader, 0, info->count * 2,
+                                      &out_offset, &out_buffer, &ptr);
+
+                       util_shorten_ubyte_elts_to_userptr(
+                                               &sctx->b.b, &ib, 0, ib.offset, info->count, ptr);
+
+                       pipe_resource_reference(&ib.buffer, NULL);
+                       ib.user_buffer = NULL;
+                       ib.buffer = out_buffer;
+                       ib.offset = out_offset;
+                       ib.index_size = 2;
+               }
 
                if (ib.user_buffer && !ib.buffer) {
                        u_upload_data(sctx->b.uploader, 0, info->count * ib.index_size,

diff --git a/src/gallium/drivers/radeonsi/si_translate.c b/src/gallium/drivers/radeonsi/si_translate.c
deleted file mode 100644 (file)
index be9d621..0000000
--- a/src/gallium/drivers/radeonsi/si_translate.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2010 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, and/or sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Dave Airlie <airlied@redhat.com>
- */
-
-#include "util/u_index_modify.h"
-#include "util/u_upload_mgr.h"
-#include "si_pipe.h"
-
-
-void si_translate_index_buffer(struct si_context *sctx,
-                              struct pipe_index_buffer *ib,
-                              unsigned count)
-{
-       struct pipe_resource *out_buffer = NULL;
-       unsigned out_offset;
-       void *ptr;
-
-       switch (ib->index_size) {
-       case 1:
-               u_upload_alloc(sctx->b.uploader, 0, count * 2,
-                              &out_offset, &out_buffer, &ptr);
-
-               util_shorten_ubyte_elts_to_userptr(
-                               &sctx->b.b, ib, 0, ib->offset, count, ptr);
-
-               pipe_resource_reference(&ib->buffer, NULL);
-               ib->buffer = out_buffer;
-               ib->offset = out_offset;
-               ib->index_size = 2;
-               break;
-       }
-}