Browse Source

Set ENABLE_LIGHT according to ctx->Light.Enabled whether or not

individual light sources are enabled.
tags/mesa_3_5
Brian Paul 25 years ago
parent
commit
72ef753d5c
2 changed files with 5 additions and 10 deletions
  1. 2
    2
      src/mesa/main/attrib.c
  2. 3
    8
      src/mesa/main/enable.c

+ 2
- 2
src/mesa/main/attrib.c View File

/* $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 * Mesa 3-D graphics library
if (ctx->Driver.ShadeModel) if (ctx->Driver.ShadeModel)
(*ctx->Driver.ShadeModel)(ctx, ctx->Light.ShadeModel); (*ctx->Driver.ShadeModel)(ctx, ctx->Light.ShadeModel);
ctx->_Enabled &= ~ENABLE_LIGHT; ctx->_Enabled &= ~ENABLE_LIGHT;
if (ctx->Light.Enabled && !is_empty_list(&ctx->Light.EnabledList))
if (ctx->Light.Enabled)
ctx->_Enabled |= ENABLE_LIGHT; ctx->_Enabled |= ENABLE_LIGHT;
break; break;
case GL_LINE_BIT: case GL_LINE_BIT:

+ 3
- 8
src/mesa/main/enable.c View File

/* $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 * Mesa 3-D graphics library
case GL_LIGHT7: case GL_LIGHT7:
if (ctx->Light.Light[cap-GL_LIGHT0].Enabled != state) { if (ctx->Light.Light[cap-GL_LIGHT0].Enabled != state) {
ctx->Light.Light[cap-GL_LIGHT0].Enabled = state; ctx->Light.Light[cap-GL_LIGHT0].Enabled = state;

if (state) { if (state) {
insert_at_tail(&ctx->Light.EnabledList, insert_at_tail(&ctx->Light.EnabledList,
&ctx->Light.Light[cap-GL_LIGHT0]); &ctx->Light.Light[cap-GL_LIGHT0]);
if (ctx->Light.Enabled)
ctx->_Enabled |= ENABLE_LIGHT;
} else {
}
else {
remove_from_list(&ctx->Light.Light[cap-GL_LIGHT0]); remove_from_list(&ctx->Light.Light[cap-GL_LIGHT0]);
if (is_empty_list(&ctx->Light.EnabledList))
ctx->_Enabled &= ~ENABLE_LIGHT;
} }

ctx->NewState |= _NEW_LIGHT; ctx->NewState |= _NEW_LIGHT;
} }
break; break;

Loading…
Cancel
Save