diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2000-10-27 16:44:40 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2000-10-27 16:44:40 +0000 |
| commit | fe5d67d95f3a5fc84c5421d409a6464642aaf2cb (patch) | |
| tree | e425a9d97e9e1bbdf4848b313c7c1548db11cb36 /src/mesa/main/light.c | |
| parent | ba58a6665f21319a636ec4c09f7f592fbc8e36b5 (diff) | |
| download | external_mesa3d-fe5d67d95f3a5fc84c5421d409a6464642aaf2cb.zip external_mesa3d-fe5d67d95f3a5fc84c5421d409a6464642aaf2cb.tar.gz external_mesa3d-fe5d67d95f3a5fc84c5421d409a6464642aaf2cb.tar.bz2 | |
Implement EXT_fog_coord and EXT_secondary_color.
EXT_secondary_color is disabled until we get some dispatch offsets from SGI.
Diffstat (limited to 'src/mesa/main/light.c')
| -rw-r--r-- | src/mesa/main/light.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index e9e19f9..962d298 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -1,4 +1,4 @@ -/* $Id: light.c,v 1.17 2000/09/26 20:53:53 brianp Exp $ */ +/* $Id: light.c,v 1.18 2000/10/27 16:44:40 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -385,7 +385,8 @@ _mesa_LightModelfv( GLenum pname, const GLfloat *params ) case GL_LIGHT_MODEL_COLOR_CONTROL: if (params[0] == (GLfloat) GL_SINGLE_COLOR) { ctx->Light.Model.ColorControl = GL_SINGLE_COLOR; - CLEAR_BITS(ctx->TriangleCaps, DD_SEPERATE_SPECULAR); + if (!ctx->Fog.ColorSumEnabled) + CLEAR_BITS(ctx->TriangleCaps, DD_SEPERATE_SPECULAR); } else if (params[0] == (GLfloat) GL_SEPARATE_SPECULAR_COLOR) { ctx->Light.Model.ColorControl = GL_SEPARATE_SPECULAR_COLOR; |