From: Marek Olšák <[email protected]>
---
src/gallium/drivers/radeonsi/si_buffer.c | 7 -------
src/gallium/drivers/radeonsi/si_pipe.h | 5 -----
src/gallium/drivers/radeonsi/si_state_draw.c | 3 ++-
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/si_buffer.c
b/src/gallium/drivers/radeonsi/si_buffer.c
index 6b05c9f..7994405 100644
--- a/src/gallium/drivers/radeonsi/si_buffer.c
+++ b/src/gallium/drivers/radeonsi/si_buffer.c
@@ -35,13 +35,6 @@
#include "si.h"
#include "si_pipe.h"
-void si_upload_index_buffer(struct si_context *sctx,
- struct pipe_index_buffer *ib, unsigned count)
-{
- u_upload_data(sctx->b.uploader, 0, count * ib->index_size,
- ib->user_buffer, &ib->offset, &ib->buffer);
-}
-
void si_upload_const_buffer(struct si_context *sctx, struct r600_resource
**rbuffer,
const uint8_t *ptr, unsigned size,
uint32_t *const_offset)
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h
b/src/gallium/drivers/radeonsi/si_pipe.h
index d7d701b..bb4d82a 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -161,11 +161,6 @@ void si_flush_depth_textures(struct si_context *sctx,
void si_decompress_color_textures(struct si_context *sctx,
struct si_textures_info *textures);
-/* si_buffer.c */
-void si_upload_index_buffer(struct si_context *sctx,
- struct pipe_index_buffer *ib, unsigned count);
-
-
/* si_pipe.c */
void si_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence,
unsigned flags);
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c
b/src/gallium/drivers/radeonsi/si_state_draw.c
index 45dd4ba..f325a64 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -721,7 +721,8 @@ void si_draw_vbo(struct pipe_context *ctx, const struct
pipe_draw_info *info)
si_translate_index_buffer(sctx, &ib, info->count);
if (ib.user_buffer && !ib.buffer) {
- si_upload_index_buffer(sctx, &ib, info->count);
+ u_upload_data(sctx->b.uploader, 0, info->count *
ib.index_size,
+ ib.user_buffer, &ib.offset, &ib.buffer);
}
}
--
1.8.3.2
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
