Mesa (master): r300g: fix draw_elements for "start" != 0

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Mon Feb 22 13:51:38 2010 +0100

r300g: fix draw_elements for "start" != 0

Reported-by: Andre Maasikas <amaasikas at gmail.com>

---

 src/gallium/drivers/r300/r300_render.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 754eb4d..648d884 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -258,11 +258,6 @@ static void r300_emit_draw_elements(struct r300_context *r300,
 
     assert((start * indexSize)  % 4 == 0);
 
-    /* XXX Non-zero offset locks up. */
-    if (offset_dwords != 0) {
-        return;
-    }
-
     if (alt_num_verts) {
         assert(count < (1 << 24));
         BEGIN_CS(16);
@@ -276,13 +271,13 @@ static void r300_emit_draw_elements(struct r300_context *r300,
     OUT_CS_REG(R300_VAP_VF_MAX_VTX_INDX, maxIndex);
     OUT_CS_PKT3(R300_PACKET3_3D_DRAW_INDX_2, 0);
     if (indexSize == 4) {
-        count_dwords = count + start;
+        count_dwords = count;
         OUT_CS(R300_VAP_VF_CNTL__PRIM_WALK_INDICES | (count << 16) |
                R300_VAP_VF_CNTL__INDEX_SIZE_32bit |
                r300_translate_primitive(mode) |
                (alt_num_verts ? R500_VAP_VF_CNTL__USE_ALT_NUM_VERTS : 0));
     } else {
-        count_dwords = (count + start + 1) / 2;
+        count_dwords = (count + 1) / 2;
         OUT_CS(R300_VAP_VF_CNTL__PRIM_WALK_INDICES | (count << 16) |
                r300_translate_primitive(mode) |
                (alt_num_verts ? R500_VAP_VF_CNTL__USE_ALT_NUM_VERTS : 0));