Mesa (master): r300g: force prefetch for non-indexed vertices

[Marek Olšák]

Module: Mesa
Branch: master
Commit: b9e637e8cf1cba99c138f5ca2d79ae5afefb1020
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9e637e8cf1cba99c138f5ca2d79ae5afefb1020

Author: Marek Olšák <maraeo at gmail.com>
Date:   Mon Apr 26 05:04:07 2010 +0200

r300g: force prefetch for non-indexed vertices

---

 src/gallium/drivers/r300/r300_emit.c   |    4 ++--
 src/gallium/drivers/r300/r300_emit.h   |    2 +-
 src/gallium/drivers/r300/r300_reg.h    |    2 +-
 src/gallium/drivers/r300/r300_render.c |    8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index 7dc7c1d..ac3b5b0 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -823,7 +823,7 @@ void r300_emit_textures_state(struct r300_context *r300,
     END_CS;
 }
 
-void r300_emit_aos(struct r300_context* r300, unsigned offset)
+void r300_emit_aos(struct r300_context* r300, unsigned offset, boolean indexed)
 {
     struct pipe_vertex_buffer *vb1, *vb2, *vbuf = r300->vertex_buffer;
     struct pipe_vertex_element *velem = r300->velems->velem;
@@ -843,7 +843,7 @@ void r300_emit_aos(struct r300_context* r300, unsigned offset)
 
     BEGIN_CS(2 + packet_size + aos_count * 2);
     OUT_CS_PKT3(R300_PACKET3_3D_LOAD_VBPNTR, packet_size);
-    OUT_CS(aos_count);
+    OUT_CS(aos_count | (!indexed ? R300_VC_FORCE_PREFETCH : 0));
 
     for (i = 0; i < aos_count - 1; i += 2) {
         vb1 = &vbuf[velem[i].vertex_buffer_index];
diff --git a/src/gallium/drivers/r300/r300_emit.h b/src/gallium/drivers/r300/r300_emit.h
index 56f7318..c3eb195 100644
--- a/src/gallium/drivers/r300/r300_emit.h
+++ b/src/gallium/drivers/r300/r300_emit.h
@@ -29,7 +29,7 @@
 struct rX00_fragment_program_code;
 struct r300_vertex_program_code;
 
-void r300_emit_aos(struct r300_context* r300, unsigned offset);
+void r300_emit_aos(struct r300_context* r300, unsigned offset, boolean indexed);
 
 void r300_emit_blend_state(struct r300_context* r300,
                            unsigned size, void* state);
diff --git a/src/gallium/drivers/r300/r300_reg.h b/src/gallium/drivers/r300/r300_reg.h
index 239f914..675a931 100644
--- a/src/gallium/drivers/r300/r300_reg.h
+++ b/src/gallium/drivers/r300/r300_reg.h
@@ -3377,7 +3377,7 @@ enum {
  * the last block is omitted.
  */
 #define R300_PACKET3_3D_LOAD_VBPNTR         0x00002F00
-
+#   define R300_VC_FORCE_PREFETCH  (1 << 5)
 #   define R300_VBPNTR_SIZE0(x)    ((x) >> 2)
 #   define R300_VBPNTR_STRIDE0(x)  (((x) >> 2) << 8)
 #   define R300_VBPNTR_SIZE1(x)    (((x) >> 2) << 16)
diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 23b61df..8e2acc4 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -574,7 +574,7 @@ void r300_draw_range_elements(struct pipe_context* pipe,
     r300_reserve_cs_space(r300, r300_get_num_dirty_dwords(r300) + 128);
     r300_emit_buffer_validate(r300, TRUE, indexBuffer);
     r300_emit_dirty_state(r300);
-    r300_emit_aos(r300, 0);
+    r300_emit_aos(r300, 0, TRUE);
 
     u_upload_flush(r300->upload_vb);
     u_upload_flush(r300->upload_ib);
@@ -595,7 +595,7 @@ void r300_draw_range_elements(struct pipe_context* pipe,
             if (count && r300_reserve_cs_space(r300, 16)) {
                 r300_emit_buffer_validate(r300, TRUE, indexBuffer);
                 r300_emit_dirty_state(r300);
-                r300_emit_aos(r300, 0);
+                r300_emit_aos(r300, 0, TRUE);
             }
         } while (count);
     }
@@ -650,12 +650,12 @@ void r300_draw_arrays(struct pipe_context* pipe, unsigned mode,
         r300_emit_dirty_state(r300);
 
         if (alt_num_verts || count <= 65535) {
-            r300_emit_aos(r300, start);
+            r300_emit_aos(r300, start, FALSE);
             r300->emit_draw_arrays(r300, mode, count);
         } else {
             do {
                 short_count = MIN2(count, 65535);
-                r300_emit_aos(r300, start);
+                r300_emit_aos(r300, start, FALSE);
                 r300->emit_draw_arrays(r300, mode, short_count);
 
                 start += short_count;