Signed-off-by: Pauli Nieminen <suok...@gmail.com>
---
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 6267293..1836089 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 43c992c..860942e 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,
@@ -529,8 +529,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]);
@@ -540,7 +538,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 );
--
1.6.3.3
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
