Mesa (master): mesa/main: Silence unused parameter warning

Ian Romanick idr at kemper.freedesktop.org
Tue Feb 17 20:30:48 UTC 2015


Module: Mesa
Branch: master
Commit: 2524f9b80d5763377600e15e584152253420ad25
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2524f9b80d5763377600e15e584152253420ad25

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Feb 10 08:58:01 2015 -0800

mesa/main: Silence unused parameter warning

Just remove the _mesa_free_lighting_data function.  The body has been
empty since the shine table was moved into the tnl module (commit
ba1d921).

main/light.c:1216:46: warning: unused parameter 'ctx' [-Wunused-parameter]
 _mesa_free_lighting_data( struct gl_context *ctx )
                                              ^

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/main/context.c |    1 -
 src/mesa/main/light.c   |    9 ---------
 src/mesa/main/light.h   |    2 --
 3 files changed, 12 deletions(-)

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 63d30a2..b186a1f 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1280,7 +1280,6 @@ _mesa_free_context_data( struct gl_context *ctx )
 
    _mesa_free_attrib_data(ctx);
    _mesa_free_buffer_objects(ctx);
-   _mesa_free_lighting_data( ctx );
    _mesa_free_eval_data( ctx );
    _mesa_free_texture_data( ctx );
    _mesa_free_matrix_data( ctx );
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index b619413..e483b82 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1207,12 +1207,3 @@ _mesa_init_lighting( struct gl_context *ctx )
    ctx->_ForceEyeCoords = GL_FALSE;
    ctx->_ModelViewInvScale = 1.0;
 }
-
-
-/**
- * Deallocate malloc'd lighting state attached to given context.
- */
-void
-_mesa_free_lighting_data( struct gl_context *ctx )
-{
-}
diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h
index c6fba2e..d009aa1 100644
--- a/src/mesa/main/light.h
+++ b/src/mesa/main/light.h
@@ -102,8 +102,6 @@ extern void _mesa_update_color_material( struct gl_context *ctx,
 
 extern void _mesa_init_lighting( struct gl_context *ctx );
 
-extern void _mesa_free_lighting_data( struct gl_context *ctx );
-
 extern void _mesa_allow_light_in_model( struct gl_context *ctx, GLboolean flag );
 
 #endif




More information about the mesa-commit mailing list