mesa: add #define FEATURE_ARB_pixel_buffer_object

[mesa.git] / src / mesa / main / light.h

diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h
index 240a6317b7124f3f5c2c74722fce0004b72d8fef..b97e17b5be4e5f55ad4babd3bd71b124ed47c456 100644 (file)
--- a/src/mesa/main/light.h
+++ b/src/mesa/main/light.h
@@ -34,50 +34,54 @@
 
 #include "mtypes.h"
 
-extern void
+extern void GLAPIENTRY
 _mesa_ShadeModel( GLenum mode );
 
 #if _HAVE_FULL_GL
-extern void
+extern void GLAPIENTRY
 _mesa_ColorMaterial( GLenum face, GLenum mode );
 
-extern void
+extern void GLAPIENTRY
 _mesa_Lightf( GLenum light, GLenum pname, GLfloat param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_Lightiv( GLenum light, GLenum pname, const GLint *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_Lighti( GLenum light, GLenum pname, GLint param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_LightModelf( GLenum pname, GLfloat param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_LightModelfv( GLenum pname, const GLfloat *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_LightModeli( GLenum pname, GLint param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_LightModeliv( GLenum pname, const GLint *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetLightfv( GLenum light, GLenum pname, GLfloat *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetLightiv( GLenum light, GLenum pname, GLint *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params );
 
 
+extern void
+_mesa_light(GLcontext *ctx, GLuint lnum, GLenum pname, const GLfloat *params);
+
+
 /* Lerp between adjacent values in the f(x) lookup table, giving a
  * continuous function, with adequeate overall accuracy.  (Though
  * still pretty good compared to a straight lookup).
@@ -88,7 +92,8 @@ do {                                                                  \
    struct gl_shine_tab *_tab = table;                                  \
    float f = (dp * (SHINE_TABLE_SIZE-1));                              \
    int k = (int) f;                                                    \
-   if (k > SHINE_TABLE_SIZE-2)                                                 \
+   if (k < 0 /* gcc may cast an overflow float value to negative int value*/ \
+       || k > SHINE_TABLE_SIZE-2)                                      \
       result = (GLfloat) _mesa_pow( dp, _tab->shininess );             \
    else                                                                        \
       result = _tab->tab[k] + (f-k)*(_tab->tab[k+1]-_tab->tab[k]);     \
@@ -111,12 +116,11 @@ extern void _mesa_update_lighting( GLcontext *ctx );
 extern void _mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state );
 
 extern void _mesa_update_material( GLcontext *ctx,
-                                   const struct gl_material src[2],
                                    GLuint bitmask );
 
-extern void _mesa_copy_material_pairs( struct gl_material dst[2],
-                                       const struct gl_material src[2],
-                                       GLuint bitmask );
+extern void _mesa_copy_materials( struct gl_material *dst,
+                                 const struct gl_material *src,
+                                 GLuint bitmask );
 
 extern void _mesa_update_color_material( GLcontext *ctx,
                                          const GLfloat rgba[4] );