diff options
| author | Mathias Fröhlich <[email protected]> | 2012-02-29 18:19:33 +0100 |
|---|---|---|
| committer | Mathias Fröhlich <[email protected]> | 2012-02-29 20:36:44 +0100 |
| commit | 619baeae3ca5b9f993d1c6ddd9c4c0541e5a4f11 (patch) | |
| tree | 659d0d11c681fa984a468b3ffa475534c2094695 | |
| parent | 6b48d7e83d4ed09ae8db0da2f8a100d68d6e5e66 (diff) | |
mesa: Remove gl_light_attrib::_Flags.
This variable is only used locally in _mesa_update_lighting.
Reviewed-by: Alex Deucher <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Signed-off-by: Mathias Froehlich <[email protected]>
| -rw-r--r-- | src/mesa/main/light.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/x86/gen_matypes.c | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index 552efa7f0a6..7ebf9bf51cf 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -1003,23 +1003,23 @@ _mesa_validate_all_lighting_tables( struct gl_context *ctx ) void _mesa_update_lighting( struct gl_context *ctx ) { + GLbitfield flags = 0; struct gl_light *light; ctx->Light._NeedEyeCoords = GL_FALSE; - ctx->Light._Flags = 0; if (!ctx->Light.Enabled) return; foreach(light, &ctx->Light.EnabledList) { - ctx->Light._Flags |= light->_Flags; + flags |= light->_Flags; } ctx->Light._NeedVertices = - ((ctx->Light._Flags & (LIGHT_POSITIONAL|LIGHT_SPOT)) || + ((flags & (LIGHT_POSITIONAL|LIGHT_SPOT)) || ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR || ctx->Light.Model.LocalViewer); - ctx->Light._NeedEyeCoords = ((ctx->Light._Flags & LIGHT_POSITIONAL) || + ctx->Light._NeedEyeCoords = ((flags & LIGHT_POSITIONAL) || ctx->Light.Model.LocalViewer); /* XXX: This test is overkill & needs to be fixed both for software and diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index b5753df1a64..2f5f85f4ea7 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -966,7 +966,6 @@ struct gl_light_attrib /*@{*/ GLboolean _NeedEyeCoords; GLboolean _NeedVertices; /**< Use fast shader? */ - GLbitfield _Flags; /**< LIGHT_* flags, see above */ GLfloat _BaseColor[2][3]; /*@}*/ }; diff --git a/src/mesa/x86/gen_matypes.c b/src/mesa/x86/gen_matypes.c index 7af82b4aea6..4fe99e799ff 100644 --- a/src/mesa/x86/gen_matypes.c +++ b/src/mesa/x86/gen_matypes.c @@ -103,7 +103,6 @@ int main( int argc, char **argv ) OFFSET( "CTX_LIGHT_COLOR_MAT_ENABLED ", struct gl_context, Light.ColorMaterialEnabled ); OFFSET( "CTX_LIGHT_ENABLED_LIST ", struct gl_context, Light.EnabledList ); OFFSET( "CTX_LIGHT_NEED_VERTS ", struct gl_context, Light._NeedVertices ); - OFFSET( "CTX_LIGHT_FLAGS ", struct gl_context, Light._Flags ); OFFSET( "CTX_LIGHT_BASE_COLOR ", struct gl_context, Light._BaseColor ); |