r200: Remove unnecessery Elts from r200 context.

Signed-off-by: Pauli Nieminen <suokkos@gmail.com>

diff --git a/src/mesa/drivers/dri/r200/r200_context.h b/src/mesa/drivers/dri/r200/r200_context.h
index 6267293817d951d67a8987617d99e4f09f606001..18360890ebda1d9cc272195e858b039292e7a98a 100644 (file)
--- 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 196cc2ab629fb359dd91d6856e54802301553811..d8020df97c07a4443d6491747484f2630c5e28b1 100644 (file)
--- 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 );