From: Marek Olšák <maraeo@gmail.com>
Date: Mon, 14 Feb 2011 09:05:52 +0000 (+0100)
Subject: r300g: fix fallback for misaligned ushort indices with num vertices >= 65535
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d173f1ba8a3d77e46f73ecb00378ea9598fe2c68;p=mesa.git

r300g: fix fallback for misaligned ushort indices with num vertices >= 65535
---

diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index fddabee7b24..051f434d428 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -615,7 +615,11 @@ static void r300_draw_range_elements(struct pipe_context* pipe,
 				minIndex, maxIndex, mode, start, count, indices3);
     } else {
         do {
-            short_count = MIN2(count, 65534);
+            if (indexSize == 2 && (start & 1))
+                short_count = MIN2(count, 65535);
+            else
+                short_count = MIN2(count, 65534);
+
             r300_emit_draw_elements(r300, indexBuffer, indexSize,
                                      minIndex, maxIndex,
                                      mode, start, short_count, indices3);