r300g: more efficient finish + fix comments
[mesa.git] / src / gallium / drivers / r300 / r300_render.c
index f6bc68c43ad968b0614a6e1322d14f73ab4194ab..42716552c7f18f5625976bb057b7d2db2eaf92c5 100644 (file)
 #include "r300_screen_buffer.h"
 #include "r300_emit.h"
 #include "r300_reg.h"
-#include "r300_render.h"
 #include "r300_state_derived.h"
 
-/* XXX The DRM rejects VAP_ALT_NUM_VERTICES.. */
-//#define ENABLE_ALT_NUM_VERTS
-
 static uint32_t r300_translate_primitive(unsigned prim)
 {
     switch (prim) {
@@ -117,16 +113,79 @@ static uint32_t r300_provoking_vertex_fixes(struct r300_context *r300,
     return color_control;
 }
 
+static void r500_emit_index_offset(struct r300_context *r300, int index_bias)
+{
+    CS_LOCALS(r300);
+
+    if (r300->screen->caps.is_r500 &&
+        r300->rws->get_value(r300->rws, R300_VID_DRM_2_3_0)) {
+        BEGIN_CS(2);
+        OUT_CS_REG(R500_VAP_INDEX_OFFSET,
+                   (index_bias & 0xFFFFFF) | (index_bias < 0 ? 1<<24 : 0));
+        END_CS;
+    } else {
+        if (index_bias) {
+            fprintf(stderr, "r300: Non-zero index bias is unsupported "
+                            "on this hardware.\n");
+            assert(0);
+        }
+    }
+}
+
+enum r300_prepare_flags {
+    PREP_FIRST_DRAW     = (1 << 0),
+    PREP_VALIDATE_VBOS  = (1 << 1),
+    PREP_EMIT_AOS       = (1 << 2),
+    PREP_INDEXED        = (1 << 3)
+};
+
 /* Check if the requested number of dwords is available in the CS and
- * if not, flush. Return TRUE if the flush occured. */
-static boolean r300_reserve_cs_space(struct r300_context *r300,
-                                     unsigned dwords)
+ * if not, flush. Then validate buffers and emit dirty state.
+ * Return TRUE if flush occured. */
+static void r300_prepare_for_rendering(struct r300_context *r300,
+                                       enum r300_prepare_flags flags,
+                                       struct pipe_resource *index_buffer,
+                                       unsigned cs_dwords,
+                                       unsigned aos_offset,
+                                       int index_bias)
 {
-    if (!r300->rws->check_cs(r300->rws, dwords)) {
+    boolean flushed = FALSE;
+    boolean first_draw = flags & PREP_FIRST_DRAW;
+    boolean emit_aos = flags & PREP_EMIT_AOS;
+
+    /* Stencil ref fallback. */
+    if (r300->stencil_ref_bf_fallback) {
+        cs_dwords = cs_dwords * 2 + 10;
+    }
+
+    /* Add dirty state, index offset, and AOS. */
+    if (first_draw) {
+        cs_dwords += r300_get_num_dirty_dwords(r300);
+
+        if (r300->screen->caps.is_r500)
+            cs_dwords += 2; /* emit_index_offset */
+
+        if (emit_aos)
+            cs_dwords += 55; /* emit_aos */
+    }
+
+    /* Emitted in flush. */
+    cs_dwords += 26; /* emit_query_end */
+
+    /* Reserve requested CS space. */
+    if (!r300->rws->check_cs(r300->rws, cs_dwords)) {
         r300->context.flush(&r300->context, 0, NULL);
-        return TRUE;
+        flushed = TRUE;
+    }
+
+    /* Validate buffers and emit dirty state if needed. */
+    if (first_draw || flushed) {
+        r300_emit_buffer_validate(r300, flags & PREP_VALIDATE_VBOS, index_buffer);
+        r300_emit_dirty_state(r300);
+        r500_emit_index_offset(r300, index_bias);
+        if (emit_aos)
+            r300_emit_aos(r300, aos_offset, flags & PREP_INDEXED);
     }
-    return FALSE;
 }
 
 static boolean immd_is_good_idea(struct r300_context *r300,
@@ -138,7 +197,15 @@ static boolean immd_is_good_idea(struct r300_context *r300,
     unsigned vertex_element_count = r300->velems->count;
     unsigned i, vbi;
 
-    if (count > 10 || DBG_ON(r300, DBG_NO_IMMD)) {
+    if (DBG_ON(r300, DBG_NO_IMMD)) {
+        return FALSE;
+    }
+
+    if (r300->draw) {
+        return FALSE;
+    }
+
+    if (count > 10) {
         return FALSE;
     }
 
@@ -152,9 +219,9 @@ static boolean immd_is_good_idea(struct r300_context *r300,
         if (!checked[vbi]) {
             vbuf = &r300->vertex_buffer[vbi];
 
-            if (r300->context.is_resource_referenced(&r300->context,
-                                                    vbuf->buffer,
-                                                    0, 0)) {
+            if (r300_buffer_is_referenced(&r300->context,
+                                          vbuf->buffer,
+                                          R300_REF_CS | R300_REF_HW)) {
                 /* It's a very bad idea to map it... */
                 return FALSE;
             }
@@ -169,10 +236,10 @@ static boolean immd_is_good_idea(struct r300_context *r300,
  * after resolving fallback issues (e.g. stencil ref two-sided).             *
  ****************************************************************************/
 
-void r500_emit_draw_arrays_immediate(struct r300_context *r300,
-                                     unsigned mode,
-                                     unsigned start,
-                                     unsigned count)
+static void r500_emit_draw_arrays_immediate(struct r300_context *r300,
+                                            unsigned mode,
+                                            unsigned start,
+                                            unsigned count)
 {
     struct pipe_vertex_element* velem;
     struct pipe_vertex_buffer* vbuf;
@@ -220,9 +287,7 @@ void r500_emit_draw_arrays_immediate(struct r300_context *r300,
 
     dwords = 9 + count * vertex_size;
 
-    r300_reserve_cs_space(r300, r300_get_num_dirty_dwords(r300) + dwords);
-    r300_emit_buffer_validate(r300, FALSE, NULL);
-    r300_emit_dirty_state(r300);
+    r300_prepare_for_rendering(r300, PREP_FIRST_DRAW, NULL, dwords, 0, 0);
 
     BEGIN_CS(dwords);
     OUT_CS_REG(R300_GA_COLOR_CONTROL,
@@ -261,27 +326,22 @@ void r500_emit_draw_arrays_immediate(struct r300_context *r300,
     }
 }
 
-void r500_emit_draw_arrays(struct r300_context *r300,
-                           unsigned mode,
-                           unsigned count)
+static void r500_emit_draw_arrays(struct r300_context *r300,
+                                  unsigned mode,
+                                  unsigned count)
 {
-#if defined(ENABLE_ALT_NUM_VERTS)
     boolean alt_num_verts = count > 65535;
-#else
-    boolean alt_num_verts = FALSE;
-#endif
     CS_LOCALS(r300);
 
+    if (count >= (1 << 24)) {
+        fprintf(stderr, "r300: Got a huge number of vertices: %i, "
+                "refusing to render.\n", count);
+        return;
+    }
+
+    BEGIN_CS(7 + (alt_num_verts ? 2 : 0));
     if (alt_num_verts) {
-        if (count >= (1 << 24)) {
-            fprintf(stderr, "r300: Got a huge number of vertices: %i, "
-                    "refusing to render.\n", count);
-            return;
-        }
-        BEGIN_CS(9);
         OUT_CS_REG(R500_VAP_ALT_NUM_VERTICES, count);
-    } else {
-        BEGIN_CS(7);
     }
     OUT_CS_REG(R300_GA_COLOR_CONTROL,
             r300_provoking_vertex_fixes(r300, mode));
@@ -295,22 +355,18 @@ void r500_emit_draw_arrays(struct r300_context *r300,
     END_CS;
 }
 
-void r500_emit_draw_elements(struct r300_context *r300,
-                             struct pipe_resource* indexBuffer,
-                             unsigned indexSize,
-                             unsigned minIndex,
-                             unsigned maxIndex,
-                             unsigned mode,
-                             unsigned start,
-                             unsigned count)
+static void r500_emit_draw_elements(struct r300_context *r300,
+                                    struct pipe_resource* indexBuffer,
+                                    unsigned indexSize,
+                                    unsigned minIndex,
+                                    unsigned maxIndex,
+                                    unsigned mode,
+                                    unsigned start,
+                                    unsigned count)
 {
     uint32_t count_dwords;
     uint32_t offset_dwords = indexSize * start / sizeof(uint32_t);
-#if defined(ENABLE_ALT_NUM_VERTS)
     boolean alt_num_verts = count > 65535;
-#else
-    boolean alt_num_verts = FALSE;
-#endif
     CS_LOCALS(r300);
 
     if (count >= (1 << 24)) {
@@ -324,11 +380,9 @@ void r500_emit_draw_elements(struct r300_context *r300,
     DBG(r300, DBG_DRAW, "r300: Indexbuf of %u indices, min %u max %u\n",
         count, minIndex, maxIndex);
 
+    BEGIN_CS(13 + (alt_num_verts ? 2 : 0));
     if (alt_num_verts) {
-        BEGIN_CS(15);
         OUT_CS_REG(R500_VAP_ALT_NUM_VERTICES, count);
-    } else {
-        BEGIN_CS(13);
     }
     OUT_CS_REG(R300_GA_COLOR_CONTROL,
             r300_provoking_vertex_fixes(r300, mode));
@@ -408,10 +462,10 @@ static void r300_end_stencil_ref_fallback(struct r300_context *r300)
     END_CS;
 }
 
-void r300_emit_draw_arrays_immediate(struct r300_context *r300,
-                                     unsigned mode,
-                                     unsigned start,
-                                     unsigned count)
+static void r300_emit_draw_arrays_immediate(struct r300_context *r300,
+                                            unsigned mode,
+                                            unsigned start,
+                                            unsigned count)
 {
     if (!r300->stencil_ref_bf_fallback) {
         r500_emit_draw_arrays_immediate(r300, mode, start, count);
@@ -424,9 +478,9 @@ void r300_emit_draw_arrays_immediate(struct r300_context *r300,
     }
 }
 
-void r300_emit_draw_arrays(struct r300_context *r300,
-                           unsigned mode,
-                           unsigned count)
+static void r300_emit_draw_arrays(struct r300_context *r300,
+                                  unsigned mode,
+                                  unsigned count)
 {
     if (!r300->stencil_ref_bf_fallback) {
         r500_emit_draw_arrays(r300, mode, count);
@@ -439,25 +493,25 @@ void r300_emit_draw_arrays(struct r300_context *r300,
     }
 }
 
-void r300_emit_draw_elements(struct r300_context *r300,
-                             struct pipe_resource* indexBuffer,
-                             unsigned indexSize,
-                             unsigned minIndex,
-                             unsigned maxIndex,
-                             unsigned mode,
-                             unsigned start,
-                             unsigned count)
+static void r300_emit_draw_elements(struct r300_context *r300,
+                                    struct pipe_resource* indexBuffer,
+                                    unsigned indexSize,
+                                    unsigned minIndex,
+                                    unsigned maxIndex,
+                                    unsigned mode,
+                                    unsigned start,
+                                    unsigned count)
 {
     if (!r300->stencil_ref_bf_fallback) {
-        r500_emit_draw_elements(r300, indexBuffer, indexSize, minIndex,
-                                maxIndex, mode, start, count);
+        r500_emit_draw_elements(r300, indexBuffer, indexSize,
+                                minIndex, maxIndex, mode, start, count);
     } else {
         r300_begin_stencil_ref_fallback(r300);
-        r500_emit_draw_elements(r300, indexBuffer, indexSize, minIndex,
-                                maxIndex, mode, start, count);
+        r500_emit_draw_elements(r300, indexBuffer, indexSize,
+                                minIndex, maxIndex, mode, start, count);
         r300_switch_stencil_ref_side(r300);
-        r500_emit_draw_elements(r300, indexBuffer, indexSize, minIndex,
-                                maxIndex, mode, start, count);
+        r500_emit_draw_elements(r300, indexBuffer, indexSize,
+                                minIndex, maxIndex, mode, start, count);
         r300_end_stencil_ref_fallback(r300);
     }
 }
@@ -525,23 +579,21 @@ static void r300_align_ushort_elts(struct r300_context *r300,
 }
 
 /* This is the fast-path drawing & emission for HW TCL. */
-void r300_draw_range_elements(struct pipe_context* pipe,
-                              struct pipe_resource* indexBuffer,
-                              unsigned indexSize,
-                              unsigned minIndex,
-                              unsigned maxIndex,
-                              unsigned mode,
-                              unsigned start,
-                              unsigned count)
+static void r300_draw_range_elements(struct pipe_context* pipe,
+                                     struct pipe_resource* indexBuffer,
+                                     unsigned indexSize,
+                                     int indexBias,
+                                     unsigned minIndex,
+                                     unsigned maxIndex,
+                                     unsigned mode,
+                                     unsigned start,
+                                     unsigned count)
 {
     struct r300_context* r300 = r300_context(pipe);
     struct pipe_resource* orgIndexBuffer = indexBuffer;
-#if defined(ENABLE_ALT_NUM_VERTS)
     boolean alt_num_verts = r300->screen->caps.is_r500 &&
-                            count > 65536;
-#else
-    boolean alt_num_verts = FALSE;
-#endif
+                            count > 65536 &&
+                            r300->rws->get_value(r300->rws, R300_VID_DRM_2_3_0);
     unsigned short_count;
 
     if (r300->skip_rendering) {
@@ -562,34 +614,33 @@ void r300_draw_range_elements(struct pipe_context* pipe,
     }
 
     r300_update_derived_state(r300);
-
     r300_upload_index_buffer(r300, &indexBuffer, indexSize, start, count);
 
-    /* 128 dwords for emit_aos and emit_draw_elements */
-    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);
+    /* 15 dwords for emit_draw_elements */
+    r300_prepare_for_rendering(r300,
+        PREP_FIRST_DRAW | PREP_VALIDATE_VBOS | PREP_EMIT_AOS | PREP_INDEXED,
+        indexBuffer, 15, 0, indexBias);
 
     u_upload_flush(r300->upload_vb);
     u_upload_flush(r300->upload_ib);
     if (alt_num_verts || count <= 65535) {
-        r300->emit_draw_elements(r300, indexBuffer, indexSize, minIndex,
-                                 maxIndex, mode, start, count);
+        r300->emit_draw_elements(r300, indexBuffer, indexSize,
+                                 minIndex, maxIndex, mode, start, count);
     } else {
         do {
             short_count = MIN2(count, 65534);
-            r300->emit_draw_elements(r300, indexBuffer, indexSize, minIndex,
-                                      maxIndex, mode, start, short_count);
+            r300->emit_draw_elements(r300, indexBuffer, indexSize,
+                                     minIndex, maxIndex,
+                                     mode, start, short_count);
 
             start += short_count;
             count -= short_count;
 
-            /* 16 spare dwords are enough for emit_draw_elements. */
-            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);
+            /* 15 dwords for emit_draw_elements */
+            if (count) {
+                r300_prepare_for_rendering(r300,
+                    PREP_VALIDATE_VBOS | PREP_EMIT_AOS | PREP_INDEXED,
+                    indexBuffer, 15, 0, indexBias);
             }
         } while (count);
     }
@@ -600,28 +651,25 @@ void r300_draw_range_elements(struct pipe_context* pipe,
 }
 
 /* Simple helpers for context setup. Should probably be moved to util. */
-void r300_draw_elements(struct pipe_context* pipe,
-                        struct pipe_resource* indexBuffer,
-                        unsigned indexSize, unsigned mode,
-                        unsigned start, unsigned count)
+static void r300_draw_elements(struct pipe_context* pipe,
+                               struct pipe_resource* indexBuffer,
+                               unsigned indexSize, int indexBias, unsigned mode,
+                               unsigned start, unsigned count)
 {
     struct r300_context *r300 = r300_context(pipe);
 
-    pipe->draw_range_elements(pipe, indexBuffer, indexSize, 0,
-                              r300->vertex_buffer_max_index,
+    pipe->draw_range_elements(pipe, indexBuffer, indexSize, indexBias,
+                              0, r300->vertex_buffer_max_index,
                               mode, start, count);
 }
 
-void r300_draw_arrays(struct pipe_context* pipe, unsigned mode,
-                      unsigned start, unsigned count)
+static void r300_draw_arrays(struct pipe_context* pipe, unsigned mode,
+                             unsigned start, unsigned count)
 {
     struct r300_context* r300 = r300_context(pipe);
-#if defined(ENABLE_ALT_NUM_VERTS)
     boolean alt_num_verts = r300->screen->caps.is_r500 &&
-                            count > 65536;
-#else
-    boolean alt_num_verts = FALSE;
-#endif
+                            count > 65536 &&
+                            r300->rws->get_value(r300->rws, R300_VID_DRM_2_3_0);
     unsigned short_count;
 
     if (r300->skip_rendering) {
@@ -637,29 +685,25 @@ void r300_draw_arrays(struct pipe_context* pipe, unsigned mode,
     if (immd_is_good_idea(r300, count)) {
         r300->emit_draw_arrays_immediate(r300, mode, start, count);
     } else {
-        /* Make sure there are at least 128 spare dwords in the command buffer.
-         * (most of it being consumed by emit_aos) */
-        r300_reserve_cs_space(r300, r300_get_num_dirty_dwords(r300) + 128);
-        r300_emit_buffer_validate(r300, TRUE, NULL);
-        r300_emit_dirty_state(r300);
+        /* 9 spare dwords for emit_draw_arrays. */
+        r300_prepare_for_rendering(r300, PREP_FIRST_DRAW | PREP_VALIDATE_VBOS | PREP_EMIT_AOS,
+                               NULL, 9, start, 0);
 
         if (alt_num_verts || count <= 65535) {
-            r300_emit_aos(r300, start);
             r300->emit_draw_arrays(r300, mode, count);
         } else {
             do {
                 short_count = MIN2(count, 65535);
-                r300_emit_aos(r300, start);
                 r300->emit_draw_arrays(r300, mode, short_count);
 
                 start += short_count;
                 count -= short_count;
 
-                /* Again, we emit both AOS and draw_arrays so there should be
-                 * at least 128 spare dwords. */
-                if (count && r300_reserve_cs_space(r300, 128)) {
-                    r300_emit_buffer_validate(r300, TRUE, NULL);
-                    r300_emit_dirty_state(r300);
+                /* 9 spare dwords for emit_draw_arrays. */
+                if (count) {
+                    r300_prepare_for_rendering(r300,
+                        PREP_VALIDATE_VBOS | PREP_EMIT_AOS, NULL, 9,
+                        start, 0);
                 }
             } while (count);
         }
@@ -673,10 +717,10 @@ void r300_draw_arrays(struct pipe_context* pipe, unsigned mode,
  ***************************************************************************/
 
 /* SW TCL arrays, using Draw. */
-void r300_swtcl_draw_arrays(struct pipe_context* pipe,
-                               unsigned mode,
-                               unsigned start,
-                               unsigned count)
+static void r300_swtcl_draw_arrays(struct pipe_context* pipe,
+                                   unsigned mode,
+                                   unsigned start,
+                                   unsigned count)
 {
     struct r300_context* r300 = r300_context(pipe);
     struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS];
@@ -690,6 +734,8 @@ void r300_swtcl_draw_arrays(struct pipe_context* pipe,
         return;
     }
 
+    r300_update_derived_state(r300);
+
     for (i = 0; i < r300->vertex_buffer_count; i++) {
         void* buf = pipe_buffer_map(pipe,
                                     r300->vertex_buffer[i].buffer,
@@ -698,10 +744,14 @@ void r300_swtcl_draw_arrays(struct pipe_context* pipe,
         draw_set_mapped_vertex_buffer(r300->draw, i, buf);
     }
 
-    draw_set_mapped_element_buffer(r300->draw, 0, NULL);
+    draw_set_mapped_element_buffer(r300->draw, 0, 0, NULL);
 
     draw_arrays(r300->draw, mode, start, count);
 
+    /* XXX Not sure whether this is the best fix.
+     * It prevents CS from being rejected and weird assertion failures. */
+    draw_flush(r300->draw);
+
     for (i = 0; i < r300->vertex_buffer_count; i++) {
         pipe_buffer_unmap(pipe, r300->vertex_buffer[i].buffer,
                          vb_transfer[i]);
@@ -710,14 +760,15 @@ void r300_swtcl_draw_arrays(struct pipe_context* pipe,
 }
 
 /* SW TCL elements, using Draw. */
-void r300_swtcl_draw_range_elements(struct pipe_context* pipe,
-                                       struct pipe_resource* indexBuffer,
-                                       unsigned indexSize,
-                                       unsigned minIndex,
-                                       unsigned maxIndex,
-                                       unsigned mode,
-                                       unsigned start,
-                                       unsigned count)
+static void r300_swtcl_draw_range_elements(struct pipe_context* pipe,
+                                           struct pipe_resource* indexBuffer,
+                                           unsigned indexSize,
+                                           int indexBias,
+                                           unsigned minIndex,
+                                           unsigned maxIndex,
+                                           unsigned mode,
+                                           unsigned start,
+                                           unsigned count)
 {
     struct r300_context* r300 = r300_context(pipe);
     struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS];
@@ -733,6 +784,8 @@ void r300_swtcl_draw_range_elements(struct pipe_context* pipe,
         return;
     }
 
+    r300_update_derived_state(r300);
+
     for (i = 0; i < r300->vertex_buffer_count; i++) {
         void* buf = pipe_buffer_map(pipe,
                                     r300->vertex_buffer[i].buffer,
@@ -743,11 +796,15 @@ void r300_swtcl_draw_range_elements(struct pipe_context* pipe,
 
     indices = pipe_buffer_map(pipe, indexBuffer,
                               PIPE_TRANSFER_READ, &ib_transfer);
-    draw_set_mapped_element_buffer_range(r300->draw, indexSize,
+    draw_set_mapped_element_buffer_range(r300->draw, indexSize, indexBias,
                                          minIndex, maxIndex, indices);
 
     draw_arrays(r300->draw, mode, start, count);
 
+    /* XXX Not sure whether this is the best fix.
+     * It prevents CS from being rejected and weird assertion failures. */
+    draw_flush(r300->draw);
+
     for (i = 0; i < r300->vertex_buffer_count; i++) {
         pipe_buffer_unmap(pipe, r300->vertex_buffer[i].buffer,
                          vb_transfer[i]);
@@ -756,8 +813,9 @@ void r300_swtcl_draw_range_elements(struct pipe_context* pipe,
 
     pipe_buffer_unmap(pipe, indexBuffer,
                      ib_transfer);
-    draw_set_mapped_element_buffer_range(r300->draw, 0, start,
-                                         start + count - 1, NULL);
+    draw_set_mapped_element_buffer_range(r300->draw, 0, 0,
+                                         start, start + count - 1,
+                                         NULL);
 }
 
 /* Object for rendering using Draw. */
@@ -780,7 +838,7 @@ struct r300_render {
     size_t vbo_max_used;
     void * vbo_ptr;
 
-   struct pipe_transfer *vbo_transfer;
+    struct pipe_transfer *vbo_transfer;
 };
 
 static INLINE struct r300_render*
@@ -795,8 +853,6 @@ r300_render_get_vertex_info(struct vbuf_render* render)
     struct r300_render* r300render = r300_render(render);
     struct r300_context* r300 = r300render->r300;
 
-    r300_update_derived_state(r300);
-
     return &r300->vertex_info;
 }
 
@@ -844,10 +900,6 @@ static void r300_render_unmap_vertices(struct vbuf_render* render,
 {
     struct r300_render* r300render = r300_render(render);
     struct pipe_context* context = &r300render->r300->context;
-    CS_LOCALS(r300render->r300);
-    BEGIN_CS(2);
-    OUT_CS_REG(R300_VAP_VF_MAX_VTX_INDX, max);
-    END_CS;
 
     r300render->vbo_max_used = MAX2(r300render->vbo_max_used,
                                     r300render->vertex_size * (max + 1));
@@ -879,38 +931,64 @@ static void r500_render_draw_arrays(struct vbuf_render* render,
 {
     struct r300_render* r300render = r300_render(render);
     struct r300_context* r300 = r300render->r300;
+    uint8_t* ptr;
+    unsigned i;
+    unsigned dwords = 6;
 
     CS_LOCALS(r300);
 
-    r300_reserve_cs_space(r300, r300_get_num_dirty_dwords(r300) + 2);
-    r300_emit_buffer_validate(r300, FALSE, NULL);
-    r300_emit_dirty_state(r300);
+    (void) i; (void) ptr;
+
+    r300_prepare_for_rendering(r300, PREP_FIRST_DRAW, NULL, dwords, 0, 0);
 
     DBG(r300, DBG_DRAW, "r300: Doing vbuf render, count %d\n", count);
 
-    BEGIN_CS(2);
+    /* Uncomment to dump all VBOs rendered through this interface.
+     * Slow and noisy!
+    ptr = pipe_buffer_map(&r300render->r300->context,
+                          r300render->vbo, PIPE_TRANSFER_READ,
+                          &r300render->vbo_transfer);
+
+    for (i = 0; i < count; i++) {
+        printf("r300: Vertex %d\n", i);
+        draw_dump_emitted_vertex(&r300->vertex_info, ptr);
+        ptr += r300->vertex_info.size * 4;
+        printf("\n");
+    }
+
+    pipe_buffer_unmap(&r300render->r300->context, r300render->vbo,
+        r300render->vbo_transfer);
+    */
+
+    BEGIN_CS(dwords);
+    OUT_CS_REG(R300_GA_COLOR_CONTROL,
+            r300_provoking_vertex_fixes(r300, r300render->prim));
+    OUT_CS_REG(R300_VAP_VF_MAX_VTX_INDX, count - 1);
     OUT_CS_PKT3(R300_PACKET3_3D_DRAW_VBUF_2, 0);
     OUT_CS(R300_VAP_VF_CNTL__PRIM_WALK_VERTEX_LIST | (count << 16) |
            r300render->hwprim);
     END_CS;
 }
 
-static void r500_render_draw(struct vbuf_render* render,
-                             const ushort* indices,
-                             uint count)
+static void r500_render_draw_elements(struct vbuf_render* render,
+                                      const ushort* indices,
+                                      uint count)
 {
     struct r300_render* r300render = r300_render(render);
     struct r300_context* r300 = r300render->r300;
     int i;
-    unsigned dwords = 2 + (count+1)/2;
+    unsigned dwords = 6 + (count+1)/2;
+    unsigned max_index = (r300render->vbo_size - r300render->vbo_offset) /
+                         (r300render->r300->vertex_info.size * 4) - 1;
 
     CS_LOCALS(r300);
 
-    r300_reserve_cs_space(r300, r300_get_num_dirty_dwords(r300) + dwords);
-    r300_emit_buffer_validate(r300, FALSE, NULL);
-    r300_emit_dirty_state(r300);
+    r300_prepare_for_rendering(r300, PREP_FIRST_DRAW, NULL, dwords, 0, 0);
 
     BEGIN_CS(dwords);
+    OUT_CS_REG(R300_GA_COLOR_CONTROL,
+            r300_provoking_vertex_fixes(r300, r300render->prim));
+    OUT_CS_REG(R300_VAP_VF_MAX_VTX_INDX, max_index);
     OUT_CS_PKT3(R300_PACKET3_3D_DRAW_INDX_2, (count+1)/2);
     OUT_CS(R300_VAP_VF_CNTL__PRIM_WALK_INDICES | (count << 16) |
            r300render->hwprim);
@@ -940,19 +1018,19 @@ static void r300_render_draw_arrays(struct vbuf_render* render,
     }
 }
 
-static void r300_render_draw(struct vbuf_render* render,
-                             const ushort* indices,
-                             uint count)
+static void r300_render_draw_elements(struct vbuf_render* render,
+                                      const ushort* indices,
+                                      uint count)
 {
     struct r300_context* r300 = r300_render(render)->r300;
 
     if (!r300->stencil_ref_bf_fallback) {
-        r500_render_draw(render, indices, count);
+        r500_render_draw_elements(render, indices, count);
     } else {
         r300_begin_stencil_ref_fallback(r300);
-        r500_render_draw(render, indices, count);
+        r500_render_draw_elements(render, indices, count);
         r300_switch_stencil_ref_side(r300);
-        r500_render_draw(render, indices, count);
+        r500_render_draw_elements(render, indices, count);
         r300_end_stencil_ref_fallback(r300);
     }
 }
@@ -978,10 +1056,10 @@ static struct vbuf_render* r300_render_create(struct r300_context* r300)
     r300render->base.unmap_vertices = r300_render_unmap_vertices;
     r300render->base.set_primitive = r300_render_set_primitive;
     if (r300->screen->caps.is_r500) {
-        r300render->base.draw = r500_render_draw;
+        r300render->base.draw_elements = r500_render_draw_elements;
         r300render->base.draw_arrays = r500_render_draw_arrays;
     } else {
-        r300render->base.draw = r300_render_draw;
+        r300render->base.draw_elements = r300_render_draw_elements;
         r300render->base.draw_arrays = r300_render_draw_arrays;
     }
     r300render->base.release_vertices = r300_render_release_vertices;
@@ -1016,3 +1094,26 @@ struct draw_stage* r300_draw_stage(struct r300_context* r300)
 
     return stage;
 }
+
+void r300_init_render_functions(struct r300_context *r300)
+{
+    if (r300->screen->caps.has_tcl) {
+        r300->context.draw_arrays = r300_draw_arrays;
+        r300->context.draw_elements = r300_draw_elements;
+        r300->context.draw_range_elements = r300_draw_range_elements;
+
+        if (r300->screen->caps.is_r500) {
+            r300->emit_draw_arrays_immediate = r500_emit_draw_arrays_immediate;
+            r300->emit_draw_arrays = r500_emit_draw_arrays;
+            r300->emit_draw_elements = r500_emit_draw_elements;
+        } else {
+            r300->emit_draw_arrays_immediate = r300_emit_draw_arrays_immediate;
+            r300->emit_draw_arrays = r300_emit_draw_arrays;
+            r300->emit_draw_elements = r300_emit_draw_elements;
+        }
+    } else {
+        r300->context.draw_arrays = r300_swtcl_draw_arrays;
+        r300->context.draw_elements = r300_draw_elements;
+        r300->context.draw_range_elements = r300_swtcl_draw_range_elements;
+    }
+}