Mesa (master): radeon: fix max indx/vertex emission due to state checker

[Dave Airlie]

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

Author: Dave Airlie <airlied at itt42.(none)>
Date:   Fri Jul 24 11:46:20 2009 +1000

radeon: fix max indx/vertex emission due to state checker

---

 .../drivers/dri/radeon/radeon_common_context.h     |    3 ++-
 src/mesa/drivers/dri/radeon/radeon_ioctl.c         |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.h b/src/mesa/drivers/dri/radeon/radeon_common_context.h
index 5c4b4ab..07a0c4c 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.h
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.h
@@ -355,7 +355,8 @@ struct radeon_tcl_info {
 
 struct radeon_ioctl {
 	GLuint vertex_offset;
-        struct radeon_bo *bo;
+	GLuint vertex_max;
+	struct radeon_bo *bo;
 	GLuint vertex_size;
 };
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.c b/src/mesa/drivers/dri/radeon/radeon_ioctl.c
index afdb5e7..1bda9cb 100644
--- a/src/mesa/drivers/dri/radeon/radeon_ioctl.c
+++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.c
@@ -273,7 +273,7 @@ GLushort *radeonAllocEltsOpenEnded( r100ContextPtr rmesa,
    } else {
      OUT_BATCH(rmesa->ioctl.vertex_offset);
    }
-   OUT_BATCH(0xffff);
+   OUT_BATCH(rmesa->ioctl.vertex_max);
    OUT_BATCH(vertex_format);
    OUT_BATCH(primitive |
 	     RADEON_CP_VC_CNTL_PRIM_WALK_IND |
@@ -342,6 +342,7 @@ void radeonEmitAOS( r100ContextPtr rmesa,
    rmesa->ioctl.bo = rmesa->radeon.tcl.aos[0].bo;
    rmesa->ioctl.vertex_offset =
      (rmesa->radeon.tcl.aos[0].offset + offset * rmesa->radeon.tcl.aos[0].stride * 4);
+   rmesa->ioctl.vertex_max = rmesa->radeon.tcl.aos[0].count;
 #else
    BATCH_LOCALS(&rmesa->radeon);
    uint32_t voffset;