diff options
| author | Keith Whitwell <[email protected]> | 2001-02-16 18:14:41 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2001-02-16 18:14:41 +0000 |
| commit | 46b0988c673b28e072fd0cbf477632a9ab6f9f18 (patch) | |
| tree | 3463116da957c6f13dcb0b415ca8476640503fc7 /src/mesa/swrast_setup/ss_context.c | |
| parent | 2448fc7deeaa870d879de17158f243f239c05b15 (diff) | |
Allow swrast to cope (fairly) cleanly with GL_SEPERATE_SPECULAR when
texturing is not enabled, and without requiring the two colors be
added externally.
As a part of this, collapsed the decomposition of quads into triangles
inside swrast to be hardwired into _swrast_Quad; removed s_quads.[ch].
Removed checks on texture state from t_vb_light.c, which was previously
required by swrast.
Moved the t_dd_ templates to a new directory.
Diffstat (limited to 'src/mesa/swrast_setup/ss_context.c')
| -rw-r--r-- | src/mesa/swrast_setup/ss_context.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/mesa/swrast_setup/ss_context.c b/src/mesa/swrast_setup/ss_context.c index 181be13f945..b15d7d98036 100644 --- a/src/mesa/swrast_setup/ss_context.c +++ b/src/mesa/swrast_setup/ss_context.c @@ -1,4 +1,4 @@ -/* $Id: ss_context.c,v 1.10 2001/02/16 00:35:35 keithw Exp $ */ +/* $Id: ss_context.c,v 1.11 2001/02/16 18:14:41 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -152,17 +152,7 @@ _swsetup_RenderStart( GLcontext *ctx ) if (VB->ClipMask && VB->importable_data) VB->import_data( ctx, VB->importable_data, - VEC_NOT_WRITEABLE|VEC_BAD_STRIDE); - - /* Ugly hack: Tie up some dangling pointers for flat/twoside code - * in ss_tritmp.h and ss_interptmp.h - */ - if ((ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) == 0 || - ctx->Texture._ReallyEnabled == 0) { - VB->SecondaryColorPtr[0] = VB->ColorPtr[0]; - VB->SecondaryColorPtr[1] = VB->ColorPtr[1]; - } - + VEC_NOT_WRITEABLE|VEC_BAD_STRIDE); } void |