summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@itt42.(none)>2009-07-24 11:46:20 +1000
committerDave Airlie <airlied@itt42.(none)>2009-08-27 14:50:42 +1000
commit20d9204fbd71aebf870834b612579419d2c278b5 (patch)
tree6c981d29bc98bf120699b8294bd76b560f09db2c
parentcefe9c4f394ff7007d33d932191e2fcaf9d08e87 (diff)
radeon: fix max indx/vertex emission due to state checker
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_common_context.h3
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_ioctl.c3
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 5c4b4abaca..07a0c4c055 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 afdb5e723e..1bda9cbe09 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;