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/s_points.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/s_points.c')
| -rw-r--r-- | src/mesa/swrast/s_points.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c index bb5de30975b..85001291e4d 100644 --- a/src/mesa/swrast/s_points.c +++ b/src/mesa/swrast/s_points.c @@ -1,4 +1,4 @@ -/* $Id: s_points.c,v 1.12 2001/01/23 23:39:37 brianp Exp $ */ +/* $Id: s_points.c,v 1.13 2001/02/16 18:14:41 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -26,6 +26,7 @@ #include "glheader.h" +#include "colormac.h" #include "context.h" #include "macros.h" #include "mmath.h" @@ -158,6 +159,18 @@ +void _swrast_add_spec_terms_point( GLcontext *ctx, + const SWvertex *v0 ) +{ + SWvertex *ncv0 = (SWvertex *)v0; + GLchan c[1][4]; + COPY_CHAN4( c[0], ncv0->color ); + ACC_3V( ncv0->color, ncv0->specular ); + SWRAST_CONTEXT(ctx)->SpecPoint( ctx, ncv0 ); + COPY_CHAN4( ncv0->color, c[0] ); +} + + /* record the current point function name */ #ifdef DEBUG @@ -263,3 +276,4 @@ _swrast_choose_point( GLcontext *ctx ) USE(gl_select_point); } } + |