Replace gl_vert_result enum with gl_varying_slot.

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

diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h
index 9c1a5eefadd9012a07febf0b6399a4f957eafcd8..e25dbf226ecd79f9f82eb8de0200649315e4d42c 100644 (file)
--- a/src/mesa/main/light.h
+++ b/src/mesa/main/light.h
@@ -28,16 +28,20 @@
 #define LIGHT_H
 
 
-#include "mtypes.h"
+#include "glheader.h"
+#include "mfeatures.h"
+
+struct gl_context;
+struct gl_light;
+struct gl_material;
 
 extern void GLAPIENTRY
 _mesa_ShadeModel( GLenum mode );
 
 extern void GLAPIENTRY
-_mesa_ProvokingVertexEXT(GLenum mode);
+_mesa_ProvokingVertex(GLenum mode);
 
 
-#if _HAVE_FULL_GL
 extern void GLAPIENTRY
 _mesa_ColorMaterial( GLenum face, GLenum mode );
 
@@ -79,68 +83,28 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params );
 
 
 extern void
-_mesa_light(GLcontext *ctx, GLuint lnum, GLenum pname, const GLfloat *params);
+_mesa_light(struct gl_context *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).
- * Result should be a GLfloat.
- */
-#define GET_SHINE_TAB_ENTRY( table, dp, result )                       \
-do {                                                                   \
-   struct gl_shine_tab *_tab = table;                                  \
-   float f = (dp * (SHINE_TABLE_SIZE-1));                              \
-   int k = (int) f;                                                    \
-   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]);     \
-} while (0)
-
-
-extern GLuint _mesa_material_bitmask( GLcontext *ctx,
+extern GLuint _mesa_material_bitmask( struct gl_context *ctx,
                                       GLenum face, GLenum pname,
                                       GLuint legal,
                                       const char * );
 
-extern void _mesa_invalidate_spot_exp_table( struct gl_light *l );
-
-extern void _mesa_invalidate_shine_table( GLcontext *ctx, GLuint i );
-
-extern void _mesa_validate_all_lighting_tables( GLcontext *ctx );
+extern void _mesa_update_lighting( struct gl_context *ctx );
 
-extern void _mesa_update_lighting( GLcontext *ctx );
+extern void _mesa_update_tnl_spaces( struct gl_context *ctx, GLuint new_state );
 
-extern void _mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state );
-
-extern void _mesa_update_material( GLcontext *ctx,
+extern void _mesa_update_material( struct gl_context *ctx,
                                    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,
+extern void _mesa_update_color_material( struct gl_context *ctx,
                                          const GLfloat rgba[4] );
 
-extern void _mesa_init_lighting( GLcontext *ctx );
+extern void _mesa_init_lighting( struct gl_context *ctx );
 
-extern void _mesa_free_lighting_data( GLcontext *ctx );
+extern void _mesa_free_lighting_data( struct gl_context *ctx );
 
-extern void _mesa_allow_light_in_model( GLcontext *ctx, GLboolean flag );
-
-#else
-#define _mesa_update_color_material( c, r ) ((void)0)
-#define _mesa_validate_all_lighting_tables( c ) ((void)0)
-#define _mesa_invalidate_spot_exp_table( l ) ((void)0)
-#define _mesa_material_bitmask( c, f, p, l, s ) 0
-#define _mesa_init_lighting( c ) ((void)0)
-#define _mesa_free_lighting_data( c ) ((void)0)
-#define _mesa_update_lighting( c ) ((void)0)
-#define _mesa_update_tnl_spaces( c, n ) ((void)0)
-#define GET_SHINE_TAB_ENTRY( table, dp, result )  ((result)=0)
-#endif
+extern void _mesa_allow_light_in_model( struct gl_context *ctx, GLboolean flag );
 
 #endif