Set ENABLE_LIGHT according to ctx->Light.Enabled whether or not
individual light sources are enabled.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* $Id: attrib.c,v 1.36 2000/11/22 07:32:16 joukj Exp $ */
|
||||
/* $Id: attrib.c,v 1.37 2000/11/27 18:59:09 brianp Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
@@ -706,7 +706,7 @@ _mesa_PopAttrib(void)
|
||||
if (ctx->Driver.ShadeModel)
|
||||
(*ctx->Driver.ShadeModel)(ctx, ctx->Light.ShadeModel);
|
||||
ctx->_Enabled &= ~ENABLE_LIGHT;
|
||||
if (ctx->Light.Enabled && !is_empty_list(&ctx->Light.EnabledList))
|
||||
if (ctx->Light.Enabled)
|
||||
ctx->_Enabled |= ENABLE_LIGHT;
|
||||
break;
|
||||
case GL_LINE_BIT:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* $Id: enable.c,v 1.34 2000/11/24 10:25:05 keithw Exp $ */
|
||||
/* $Id: enable.c,v 1.35 2000/11/27 18:59:09 brianp Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
@@ -181,18 +181,13 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
|
||||
case GL_LIGHT7:
|
||||
if (ctx->Light.Light[cap-GL_LIGHT0].Enabled != state) {
|
||||
ctx->Light.Light[cap-GL_LIGHT0].Enabled = state;
|
||||
|
||||
if (state) {
|
||||
insert_at_tail(&ctx->Light.EnabledList,
|
||||
&ctx->Light.Light[cap-GL_LIGHT0]);
|
||||
if (ctx->Light.Enabled)
|
||||
ctx->_Enabled |= ENABLE_LIGHT;
|
||||
} else {
|
||||
remove_from_list(&ctx->Light.Light[cap-GL_LIGHT0]);
|
||||
if (is_empty_list(&ctx->Light.EnabledList))
|
||||
ctx->_Enabled &= ~ENABLE_LIGHT;
|
||||
}
|
||||
|
||||
else {
|
||||
remove_from_list(&ctx->Light.Light[cap-GL_LIGHT0]);
|
||||
}
|
||||
ctx->NewState |= _NEW_LIGHT;
|
||||
}
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user