Mesa (master): r300g: upload translated indices via the uploader
Marek Olšák
mareko at kemper.freedesktop.org
Sun Jan 30 02:30:41 UTC 2011
Module: Mesa
Branch: master
Commit: debc45bca07a5dfad4199079f080b35c19f00e85
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=debc45bca07a5dfad4199079f080b35c19f00e85
Author: Marek Olšák <maraeo at gmail.com>
Date: Sat Jan 29 16:53:48 2011 +0100
r300g: upload translated indices via the uploader
---
src/gallium/drivers/r300/r300_render_translate.c | 65 +++++++++++++++-------
1 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_render_translate.c b/src/gallium/drivers/r300/r300_render_translate.c
index 3b544ae..ec4eaa9 100644
--- a/src/gallium/drivers/r300/r300_render_translate.c
+++ b/src/gallium/drivers/r300/r300_render_translate.c
@@ -205,34 +205,59 @@ void r300_end_vertex_translate(struct r300_context *r300)
r300->real_vertex_buffer_count = r300->vertex_buffer_count;
}
-/* XXX Use the uploader. */
void r300_translate_index_buffer(struct r300_context *r300,
struct pipe_resource **index_buffer,
unsigned *index_size, unsigned index_offset,
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(&r300->context, index_buffer, index_offset, *start, count);
- *index_size = 2;
- *start = 0;
+ case 1:
+ u_upload_alloc(r300->upload_ib, 0, count * 2,
+ &out_offset, &out_buffer, &flushed, &ptr);
+
+ util_shorten_ubyte_elts_to_userptr(
+ &r300->context, *index_buffer, index_offset,
+ *start, count, ptr);
+
+ pipe_resource_reference(index_buffer, out_buffer);
+ *index_size = 2;
+ *start = out_offset / 2;
+ r300->validate_buffers = TRUE;
+ break;
+
+ case 2:
+ if (index_offset) {
+ u_upload_alloc(r300->upload_ib, 0, count * 2,
+ &out_offset, &out_buffer, &flushed, &ptr);
+
+ util_rebuild_ushort_elts_to_userptr(&r300->context, *index_buffer,
+ index_offset, *start,
+ count, ptr);
+
+ pipe_resource_reference(index_buffer, out_buffer);
+ *start = out_offset / 2;
r300->validate_buffers = TRUE;
- break;
+ }
+ break;
- case 2:
- if (index_offset) {
- util_rebuild_ushort_elts(&r300->context, index_buffer, index_offset, *start, count);
- *start = 0;
- r300->validate_buffers = TRUE;
- }
- break;
+ case 4:
+ if (index_offset) {
+ u_upload_alloc(r300->upload_ib, 0, count * 4,
+ &out_offset, &out_buffer, &flushed, &ptr);
- case 4:
- if (index_offset) {
- util_rebuild_uint_elts(&r300->context, index_buffer, index_offset, *start, count);
- *start = 0;
- r300->validate_buffers = TRUE;
- }
- break;
+ util_rebuild_uint_elts_to_userptr(&r300->context, *index_buffer,
+ index_offset, *start,
+ count, ptr);
+
+ pipe_resource_reference(index_buffer, out_buffer);
+ *start = out_offset / 4;
+ r300->validate_buffers = TRUE;
+ }
+ break;
}
}
More information about the mesa-commit
mailing list