4 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pipe_vbuf.c b/src/gallium/auxiliary/draw/draw_pipe_vbuf.c
index fb0d895084..5ead25efff 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_vbuf.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_vbuf.c
@@ -399,7 +399,7 @@ vbuf_alloc_vertices( struct vbuf_stage *vbuf )
     * and it will flush itself if necessary to do so.  If this does
     * fail, we are basically without usable hardware.
     */
-   assert(vbuf->max_vertices < 65536);
+   assert(vbuf->max_vertices < UNDEFINED_VERTEX_ID);
 
    vbuf->vertices = (uint *) vbuf->render->allocate_vertices(vbuf->render,
 							     (ushort) vbuf->vertex_size,
diff --git a/src/gallium/auxiliary/draw/draw_pt_emit.c b/src/gallium/auxiliary/draw/draw_pt_emit.c
index c4fc93ffba..232dfdaed2 100644
--- a/src/gallium/auxiliary/draw/draw_pt_emit.c
+++ b/src/gallium/auxiliary/draw/draw_pt_emit.c
@@ -165,7 +165,7 @@ void draw_pt_emit( struct pt_emit *emit,
     */
    draw_do_flush( draw, DRAW_FLUSH_BACKEND );
 
-   if (vertex_count > 65535) { /* FIXME */
+   if (vertex_count >= UNDEFINED_VERTEX_ID) {
       assert(0);
       return;
    }
@@ -231,7 +231,7 @@ void draw_pt_emit_linear(struct pt_emit *emit,
     */
    draw_do_flush( draw, DRAW_FLUSH_BACKEND );
 
-   if (count > 65535) { /* FIXME */
+   if (count >= UNDEFINED_VERTEX_ID) {
       assert(0);
       return;
    }
diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_emit.c b/src/gallium/auxiliary/draw/draw_pt_fetch_emit.c
index 5727b91c48..39159b747d 100644
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_emit.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_emit.c
@@ -229,7 +229,7 @@ static void fetch_emit_run( struct draw_pt_middle_end *middle,
     */
    draw_do_flush( draw, DRAW_FLUSH_BACKEND );
 
-   if (fetch_count > 65535) { /* FIXME */
+   if (fetch_count >= UNDEFINED_VERTEX_ID) {
       assert(0);
       return;
    }
@@ -288,7 +288,7 @@ static void fetch_emit_run_linear( struct draw_pt_middle_end *middle,
     */
    draw_do_flush( draw, DRAW_FLUSH_BACKEND );
 
-   if (count > 65535) { /* FIXME */
+   if (count >= UNDEFINED_VERTEX_ID)
       assert(0);
       return;
    }
@@ -348,7 +348,7 @@ static boolean fetch_emit_run_linear_elts( struct draw_pt_middle_end *middle,
     */
    draw_do_flush( draw, DRAW_FLUSH_BACKEND );
 
-   if (count > 65535) /* FIXME */
+   if (count >= UNDEFINED_VERTEX_ID)
       return FALSE;
 
    hw_verts = draw->render->allocate_vertices( draw->render,
diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c
index 69580f1472..1649cdc6cd 100644
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c
@@ -234,7 +234,7 @@ static void fse_run_linear( struct draw_pt_middle_end *middle,
     */
    draw_do_flush( draw, DRAW_FLUSH_BACKEND );
 
-   if (count > 65535) { /* FIXME */
+   if (count >= UNDEFINED_VERTEX_ID) {
       assert(0);
       return;
    }
@@ -298,7 +298,7 @@ fse_run(struct draw_pt_middle_end *middle,
     */
    draw_do_flush( draw, DRAW_FLUSH_BACKEND );
 
-   if (fetch_count > 65535) { /* FIXME */
+   if (fetch_count >= UNDEFINED_VERTEX_ID) {
       assert(0);
       return;
    }
@@ -357,7 +357,7 @@ static boolean fse_run_linear_elts( struct draw_pt_middle_end *middle,
     */
    draw_do_flush( draw, DRAW_FLUSH_BACKEND );
 
-   if (count > 65535) /* FIXME */
+   if (count >= UNDEFINED_VERTEX_ID)
       return FALSE;
 
    hw_verts = draw->render->allocate_vertices( draw->render,