From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Fri, 12 Mar 2010 10:47:44 +0000 (-0800)
Subject: r300g: Properly clamp index limits.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e42b2f768509b6984c7186805c6a8afdaebf3a06;p=mesa.git

r300g: Properly clamp index limits.

Make the kernel even less likely to barf on us.
---

diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 9c001ae186d..ef1b7510e18 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -280,7 +280,7 @@ static void r300_emit_draw_elements(struct r300_context *r300,
     DBG(r300, DBG_DRAW, "r300: Indexbuf of %u indices, min %u max %u\n",
         count, minIndex, maxIndex);
 
-    maxIndex = MIN2(maxIndex, r300->vertex_buffer_max_index);
+    maxIndex = MIN3(maxIndex, r300->vertex_buffer_max_index, (1 << 24) - 1);
 
     if (alt_num_verts) {
         BEGIN_CS(15);
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index bd4c2766cb1..ced6c810ec5 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -1031,7 +1031,7 @@ static void r300_set_vertex_buffers(struct pipe_context* pipe,
                                     const struct pipe_vertex_buffer* buffers)
 {
     struct r300_context* r300 = r300_context(pipe);
-    unsigned i, max_index = ~0;
+    unsigned i, max_index = (1 << 24) - 1;
 
     memcpy(r300->vertex_buffer, buffers,
         sizeof(struct pipe_vertex_buffer) * count);