summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2001-04-28 15:47:48 +0000
committerKeith Whitwell <[email protected]>2001-04-28 15:47:48 +0000
commitf358988f2e121bb164002e9d1b536eb25b446f14 (patch)
treeb84795eb994a54e22bb17278c9887e227e37fafe
parent04a374bd0506c565e362faaee7fa78ce0566731a (diff)
fix color copying in twosided quads
-rw-r--r--src/mesa/drivers/common/t_dd_tritmp.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/mesa/drivers/common/t_dd_tritmp.h b/src/mesa/drivers/common/t_dd_tritmp.h
index 22eff7f252f..87800929e68 100644
--- a/src/mesa/drivers/common/t_dd_tritmp.h
+++ b/src/mesa/drivers/common/t_dd_tritmp.h
@@ -1,4 +1,4 @@
-/* $Id: t_dd_tritmp.h,v 1.9 2001/04/28 08:39:18 keithw Exp $ */
+/* $Id: t_dd_tritmp.h,v 1.10 2001/04/28 15:47:48 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -389,21 +389,29 @@ static void TAG(quad)( GLcontext *ctx,
(void)vbcolor;
if (!DO_FLAT) {
+ VERT_SAVE_RGBA( 0 );
+ VERT_SAVE_RGBA( 1 );
+ VERT_SAVE_RGBA( 2 );
VERT_SET_RGBA( v[0], vbcolor[e0] );
VERT_SET_RGBA( v[1], vbcolor[e1] );
VERT_SET_RGBA( v[2], vbcolor[e2] );
}
+ VERT_SAVE_RGBA( 3 );
VERT_SET_RGBA( v[3], vbcolor[e3] );
- if (HAVE_SPEC && VB->SecondaryColorPtr[facing]) {
+ if (HAVE_SPEC && VB->SecondaryColorPtr[1]) {
GLchan (*vbspec)[4] = VB->SecondaryColorPtr[1]->Ptr;
ASSERT(VB->SecondaryColorPtr[1]->StrideB==4*sizeof(GLfloat));
if (!DO_FLAT) {
+ VERT_SAVE_SPEC( 0 );
+ VERT_SAVE_SPEC( 1 );
+ VERT_SAVE_SPEC( 2 );
VERT_SET_SPEC( v[0], vbspec[e0] );
VERT_SET_SPEC( v[1], vbspec[e1] );
VERT_SET_SPEC( v[2], vbspec[e2] );
}
+ VERT_SAVE_SPEC( 3 );
VERT_SET_SPEC( v[3], vbspec[e3] );
}
}