1 files changed, 19 insertions, 163 deletions

diff --git a/src/gallium/drivers/r600/r600_translate.c b/src/gallium/drivers/r600/r600_translate.c
index f80fa7af941..7482d15e12f 100644
--- a/src/gallium/drivers/r600/r600_translate.c
+++ b/src/gallium/drivers/r600/r600_translate.c
@@ -22,178 +22,34 @@
  *
  * Authors: Dave Airlie <[email protected]>
  */
-#include "translate/translate_cache.h"
-#include "translate/translate.h"
-#include <pipebuffer/pb_buffer.h>
+
 #include <util/u_index_modify.h>
+#include "util/u_inlines.h"
+#include "util/u_upload_mgr.h"
 #include "r600_pipe.h"
 
-void r600_begin_vertex_translate(struct r600_pipe_context *rctx)
-{
-	struct pipe_context *pipe = &rctx->context;
-	struct translate_key key = {0};
-	struct translate_element *te;
-	unsigned tr_elem_index[PIPE_MAX_ATTRIBS] = {0};
-	struct translate *tr;
-	struct r600_vertex_element *ve = rctx->vertex_elements;
-	boolean vb_translated[PIPE_MAX_ATTRIBS] = {0};
-	void *vb_map[PIPE_MAX_ATTRIBS] = {0}, *out_map;
-	struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS] = {0}, *out_transfer;
-	struct pipe_resource *out_buffer;
-	unsigned i, num_verts;
-	struct pipe_vertex_element new_velems[PIPE_MAX_ATTRIBS];
-	void *tmp;
-
-	/* Initialize the translate key, i.e. the recipe how vertices should be
-	 * translated. */
-	for (i = 0; i < ve->count; i++) {
-		struct pipe_vertex_buffer *vb =
-			&rctx->vertex_buffer[ve->elements[i].vertex_buffer_index];
-		enum pipe_format output_format = ve->hw_format[i];
-		unsigned output_format_size = ve->hw_format_size[i];
-
-		/* Check for support. */
-		if (ve->elements[i].src_format == ve->hw_format[i]) {
-			continue;
-		}
-
-		/* Workaround for translate: output floats instead of halfs. */
-		switch (output_format) {
-		case PIPE_FORMAT_R16_FLOAT:
-			output_format = PIPE_FORMAT_R32_FLOAT;
-			output_format_size = 4;
-			break;
-		case PIPE_FORMAT_R16G16_FLOAT:
-			output_format = PIPE_FORMAT_R32G32_FLOAT;
-			output_format_size = 8;
-			break;
-		case PIPE_FORMAT_R16G16B16_FLOAT:
-			output_format = PIPE_FORMAT_R32G32B32_FLOAT;
-			output_format_size = 12;
-			break;
-		case PIPE_FORMAT_R16G16B16A16_FLOAT:
-			output_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
-			output_format_size = 16;
-			break;
-		default:;
-		}
-
-		/* Add this vertex element. */
-		te = &key.element[key.nr_elements];
-		/*te->type;
-		  te->instance_divisor;*/
-		te->input_buffer = ve->elements[i].vertex_buffer_index;
-		te->input_format = ve->elements[i].src_format;
-		te->input_offset = vb->buffer_offset + ve->elements[i].src_offset;
-		te->output_format = output_format;
-		te->output_offset = key.output_stride;
-
-		key.output_stride += output_format_size;
-		vb_translated[ve->elements[i].vertex_buffer_index] = TRUE;
-		tr_elem_index[i] = key.nr_elements;
-		key.nr_elements++;
-	}
-
-	/* Get a translate object. */
-	tr = translate_cache_find(rctx->tran.translate_cache, &key);
-
-	/* Map buffers we want to translate. */
-	for (i = 0; i < rctx->nvertex_buffer; i++) {
-		if (vb_translated[i]) {
-			struct pipe_vertex_buffer *vb = &rctx->vertex_buffer[i];
-
-			vb_map[i] = pipe_buffer_map(pipe, vb->buffer,
-						    PIPE_TRANSFER_READ, &vb_transfer[i]);
-
-			tr->set_buffer(tr, i, vb_map[i], vb->stride, vb->max_index);
-		}
-	}
-
-	/* Create and map the output buffer. */
-	num_verts = rctx->vb_max_index + 1;
-
-	out_buffer = pipe_buffer_create(&rctx->screen->screen,
-					PIPE_BIND_VERTEX_BUFFER,
-					key.output_stride * num_verts);
-
-	out_map = pipe_buffer_map(pipe, out_buffer, PIPE_TRANSFER_WRITE,
-				  &out_transfer);
-
-	/* Translate. */
-	tr->run(tr, 0, num_verts, 0, out_map);
-
-	/* Unmap all buffers. */
-	for (i = 0; i < rctx->nvertex_buffer; i++) {
-		if (vb_translated[i]) {
-			pipe_buffer_unmap(pipe, vb_transfer[i]);
-		}
-	}
-
-	pipe_buffer_unmap(pipe, out_transfer);
-
-	/* Setup the new vertex buffer in the first free slot. */
-	for (i = 0; i < PIPE_MAX_ATTRIBS; i++) {
-		struct pipe_vertex_buffer *vb = &rctx->vertex_buffer[i];
-
-		if (!vb->buffer) {
-			pipe_resource_reference(&vb->buffer, out_buffer);
-			vb->buffer_offset = 0;
-			vb->max_index = num_verts - 1;
-			vb->stride = key.output_stride;
-			rctx->tran.vb_slot = i;
-			break;
-		}
-	}
-
-	/* Save and replace vertex elements. */
-	for (i = 0; i < ve->count; i++) {
-		if (vb_translated[ve->elements[i].vertex_buffer_index]) {
-			te = &key.element[tr_elem_index[i]];
-			new_velems[i].instance_divisor = ve->elements[i].instance_divisor;
-			new_velems[i].src_format = te->output_format;
-			new_velems[i].src_offset = te->output_offset;
-			new_velems[i].vertex_buffer_index = rctx->tran.vb_slot;
-		} else {
-			memcpy(&new_velems[i], &ve->elements[i],
-					sizeof(struct pipe_vertex_element));
-		}
-	}
-
-	tmp = pipe->create_vertex_elements_state(pipe, ve->count, new_velems);
-	pipe->bind_vertex_elements_state(pipe, tmp);
-	rctx->tran.new_velems = tmp;
-
-	pipe_resource_reference(&out_buffer, NULL);
-}
-
-void r600_end_vertex_translate(struct r600_pipe_context *rctx)
-{
-	struct pipe_context *pipe = &rctx->context;
-
-	if (rctx->tran.new_velems == NULL) {
-		return;
-	}
-	/* Restore vertex elements. */
-	pipe->delete_vertex_elements_state(pipe, rctx->tran.new_velems);
-	rctx->tran.new_velems = NULL;
-
-	/* Delete the now-unused VBO. */
-	pipe_resource_reference(&rctx->vertex_buffer[rctx->tran.vb_slot].buffer, NULL);
-}
 
 void r600_translate_index_buffer(struct r600_pipe_context *r600,
-					struct pipe_resource **index_buffer,
-					unsigned *index_size,
-					unsigned *start, unsigned count)
+				 struct pipe_resource **index_buffer,
+				 unsigned *index_size,
+				 unsigned *start, unsigned count)
 {
+	struct pipe_resource *out_buffer = NULL;
+	unsigned out_offset;
+	void *ptr;
+	boolean flushed;
+
 	switch (*index_size) {
 	case 1:
-		util_shorten_ubyte_elts(&r600->context, index_buffer, 0, *start, count);
+		u_upload_alloc(r600->vbuf_mgr->uploader, 0, count * 2,
+			       &out_offset, &out_buffer, &flushed, &ptr);
+
+		util_shorten_ubyte_elts_to_userptr(
+				&r600->context, *index_buffer, 0, *start, count, ptr);
+
+		pipe_resource_reference(index_buffer, out_buffer);
 		*index_size = 2;
-		*start = 0;
-		break;
-	case 2:
-	case 4:
+		*start = out_offset / 2;
 		break;
 	}
 }