From e083f53ce4a8115df9d56b99d5dcfc249c7f90e7 Mon Sep 17 00:00:00 2001 From: Pauli Nieminen Date: Wed, 12 Aug 2009 01:12:23 +0300 Subject: [PATCH] r200: Remove unnecessery Elts from r200 context. Signed-off-by: Pauli Nieminen --- src/mesa/drivers/dri/r200/r200_context.h | 2 -- src/mesa/drivers/dri/r200/r200_tcl.c | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_context.h b/src/mesa/drivers/dri/r200/r200_context.h index 6267293817d..18360890ebd 100644 --- a/src/mesa/drivers/dri/r200/r200_context.h +++ b/src/mesa/drivers/dri/r200/r200_context.h @@ -526,8 +526,6 @@ struct r200_state { struct r200_tcl_info { GLuint hw_primitive; - GLuint *Elts; - int elt_used; }; diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c b/src/mesa/drivers/dri/r200/r200_tcl.c index 196cc2ab629..d8020df97c0 100644 --- a/src/mesa/drivers/dri/r200/r200_tcl.c +++ b/src/mesa/drivers/dri/r200/r200_tcl.c @@ -109,7 +109,7 @@ static GLboolean discrete_prim[0x10] = { #define ELT_INIT(prim, hw_prim) \ r200TclPrimitive( ctx, prim, hw_prim | R200_VF_PRIM_WALK_IND ) -#define GET_MESA_ELTS() rmesa->tcl.Elts +#define GET_MESA_ELTS() TNL_CONTEXT(ctx)->vb.Elts /* Don't really know how many elts will fit in what's left of cmdbuf, @@ -533,8 +533,6 @@ static GLboolean r200_run_tcl_render( GLcontext *ctx, r200EnsureEmitSize( ctx, vimap_rev ); r200EmitArrays( ctx, vimap_rev ); - rmesa->tcl.Elts = VB->Elts; - for (i = 0 ; i < VB->PrimitiveCount ; i++) { GLuint prim = _tnl_translate_prim(&VB->Primitive[i]); @@ -544,7 +542,7 @@ static GLboolean r200_run_tcl_render( GLcontext *ctx, if (!length) continue; - if (rmesa->tcl.Elts) + if (VB->Elts) r200EmitEltPrimitive( ctx, start, start+length, prim ); else r200EmitPrimitive( ctx, start, start+length, prim ); -- 2.11.0