diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2001-01-08 04:09:41 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2001-01-08 04:09:41 +0000 |
| commit | b980b2eeb62dc48101a7481d02d196c80b9da397 (patch) | |
| tree | 2b9bf4b63b99a6df4e96123181da0a624289ad92 /src/mesa/tnl/t_vb_light.c | |
| parent | 44d8de433e684cb4c2bc4dfc5cc6919af1f3cc55 (diff) | |
Add a 'RenderPrimitive' callback to t_vb_render.c. Helps out drivers
that used to require a 'ReducedPrimitiveChange' callback.
Various compilation fixes for XFree86.
Reverted to the older version of glcore.h used internally in XFree86, and
moved it to 'Mesa/include/GL/internal/glcore.h', for compatibility with
XFree86.
Diffstat (limited to 'src/mesa/tnl/t_vb_light.c')
| -rw-r--r-- | src/mesa/tnl/t_vb_light.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_vb_light.c b/src/mesa/tnl/t_vb_light.c index 043eb7302f..48c8e09313 100644 --- a/src/mesa/tnl/t_vb_light.c +++ b/src/mesa/tnl/t_vb_light.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_light.c,v 1.2 2000/12/27 19:57:37 keithw Exp $ */ +/* $Id: t_vb_light.c,v 1.3 2001/01/08 04:09:42 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -246,6 +246,10 @@ static void check_lighting( GLcontext *ctx, struct gl_pipeline_stage *stage ) stage->inputs |= VERT_EYE; /* effectively, even when lighting in obj */ if (ctx->Light.ColorMaterialEnabled) stage->inputs |= VERT_RGBA; + + stage->outputs = VERT_RGBA; + if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR) + stage->outputs |= VERT_SPEC_RGB; } } @@ -273,7 +277,7 @@ const struct gl_pipeline_stage _tnl_lighting_stage = _NEW_LIGHT|_NEW_MODELVIEW, /* recalc -- modelview dependency * otherwise not captured by inputs * (which may be VERT_OBJ) */ - 0,0,VERT_RGBA, /* active, inputs, outputs */ + 0,0,0, /* active, inputs, outputs */ 0,0, /* changed_inputs, private_data */ dtr, /* destroy */ check_lighting, /* check */ |