From 8d0a540020f6389ca5efcd0e1fbef45a4a1f5b6a Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sat, 29 Jan 2011 13:58:02 +0100 Subject: r300g: rework vertex format fallback 1) Only translate the [min_index, max_index] range. 2) Upload translated vertices via the uploader. 3) Rename valid_vertex_buffer[] to real_vertex_buffer[] --- src/gallium/drivers/r300/r300_context.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gallium/drivers/r300/r300_context.h') diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h index 57ecfb168f..430a0ddbb5 100644 --- a/src/gallium/drivers/r300/r300_context.h +++ b/src/gallium/drivers/r300/r300_context.h @@ -445,6 +445,7 @@ struct r300_translate_context { /* Saved and new vertex element state. */ void *saved_velems, *new_velems; + unsigned vb_slot; }; struct r300_context { @@ -560,8 +561,9 @@ struct r300_context { /* May contain user buffers. */ struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS]; /* Contains only non-user buffers. */ - struct pipe_resource *valid_vertex_buffer[PIPE_MAX_ATTRIBS]; + struct pipe_resource *real_vertex_buffer[PIPE_MAX_ATTRIBS]; int vertex_buffer_count; + int real_vertex_buffer_count; /* with the translated buffer. */ int vertex_buffer_max_index; boolean any_user_vbs; /* Vertex elements for Gallium. */ -- cgit v1.2.3