[Mesa-dev] [PATCH 2/3] mesa: make _mesa_invalidate_shine_table() static

Brian Paul brianp at vmware.com
Wed Feb 8 19:13:43 PST 2012


---
 src/mesa/main/light.c |   13 +++++++++----
 src/mesa/main/light.h |    2 --
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 39a984b..a16d0e9 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -623,6 +623,11 @@ _mesa_material_bitmask( struct gl_context *ctx, GLenum face, GLenum pname,
 
 
 
+static void
+invalidate_shine_table( struct gl_context *ctx, GLuint side );
+
+
+
 /* Update derived values following a change in ctx->Light.Material
  */
 void
@@ -696,11 +701,11 @@ _mesa_update_material( struct gl_context *ctx, GLuint bitmask )
    }
 
    if (bitmask & MAT_BIT_FRONT_SHININESS) {
-      _mesa_invalidate_shine_table( ctx, 0 );
+      invalidate_shine_table( ctx, 0 );
    }
 
    if (bitmask & MAT_BIT_BACK_SHININESS) {
-      _mesa_invalidate_shine_table( ctx, 1 );
+      invalidate_shine_table( ctx, 1 );
    }
 }
 
@@ -914,8 +919,8 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params )
  * lighting, and the cost of doing it early may be partially offset
  * by keeping a MRU cache of shine tables for various shine values.
  */
-void
-_mesa_invalidate_shine_table( struct gl_context *ctx, GLuint side )
+static void
+invalidate_shine_table( struct gl_context *ctx, GLuint side )
 {
    ASSERT(side < 2);
    if (ctx->_ShineTable[side])
diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h
index 8b19e63..26e604b 100644
--- a/src/mesa/main/light.h
+++ b/src/mesa/main/light.h
@@ -110,8 +110,6 @@ extern GLuint _mesa_material_bitmask( struct gl_context *ctx,
                                       GLuint legal,
                                       const char * );
 
-extern void _mesa_invalidate_shine_table( struct gl_context *ctx, GLuint i );
-
 extern void _mesa_validate_all_lighting_tables( struct gl_context *ctx );
 
 extern void _mesa_update_lighting( struct gl_context *ctx );
-- 
1.7.3.4



More information about the mesa-dev mailing list