From 0f0a9e3ee752f1746d6dba748522fb3e15e4af1a Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Thu, 20 Aug 2009 12:10:42 -0400 Subject: r600: try and get everything in the draw in one IB fixes corruption issues with apps like teapot and geartrain. --- src/mesa/drivers/dri/r600/r700_render.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/drivers/dri/r600/r700_render.c b/src/mesa/drivers/dri/r600/r700_render.c index 58b4491d00..80df78f123 100644 --- a/src/mesa/drivers/dri/r600/r700_render.c +++ b/src/mesa/drivers/dri/r600/r700_render.c @@ -341,10 +341,9 @@ void r700EmitState(GLcontext * ctx) return; rcommonEnsureCmdBufSpace(&context->radeon, - context->radeon.hw.max_state_size, __FUNCTION__); + 652, __FUNCTION__); r700SendSQConfig(context); - r700SendUCPState(context); r700SendContextStates(context); r700SendViewportState(context, 0); @@ -357,10 +356,18 @@ static GLboolean r700RunRender(GLcontext * ctx, struct tnl_pipeline_stage *stage) { context_t *context = R700_CONTEXT(ctx); - unsigned int i; + radeonContextPtr radeon = &context->radeon; + unsigned int i, ind_count = 0; TNLcontext *tnl = TNL_CONTEXT(ctx); struct vertex_buffer *vb = &tnl->vb; + for (i = 0; i < vb->PrimitiveCount; i++) + ind_count += vb->Primitive[i].count + 10; + + /* just an estimate, need to properly calculate this */ + rcommonEnsureCmdBufSpace(&context->radeon, + radeon->hw.max_state_size + ind_count, __FUNCTION__); + r700Start3D(context); r700UpdateShaders(ctx); -- cgit v1.2.3