diff options
| author | Keith Whitwell <[email protected]> | 2001-02-16 00:35:34 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2001-02-16 00:35:34 +0000 |
| commit | 2448fc7deeaa870d879de17158f243f239c05b15 (patch) | |
| tree | c5d192531cdc1043b54856b9d60f6c3e8e217b33 /src/mesa/swrast_setup/ss_context.c | |
| parent | 86ca15ece74ccb5a8f4d566a4b2c8024b178d73b (diff) | |
Fixed conform problems with recent material tracking change.
Remove redundant 'update_materials' stage.
Fix conform segfault with seperate specular colors in mustpass.c. These
tests still fail, however.
Diffstat (limited to 'src/mesa/swrast_setup/ss_context.c')
| -rw-r--r-- | src/mesa/swrast_setup/ss_context.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/mesa/swrast_setup/ss_context.c b/src/mesa/swrast_setup/ss_context.c index 83c7f45ffa6..181be13f945 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.9 2001/01/29 20:47:39 keithw Exp $ */ +/* $Id: ss_context.c,v 1.10 2001/02/16 00:35:35 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -153,6 +153,16 @@ _swsetup_RenderStart( GLcontext *ctx ) 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]; + } + } void |