X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Flight.h;h=9c1a5eefadd9012a07febf0b6399a4f957eafcd8;hb=b40dc7e7fcafc30ebaa3778ee847c8983987de83;hp=b39aa002d879067de9361b1f77d7d7716eea4688;hpb=d1baa05439c7157eeca42ec191d5375821725bdd;p=mesa.git

diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h
index b39aa002d87..9c1a5eefadd 100644
--- a/src/mesa/main/light.h
+++ b/src/mesa/main/light.h
@@ -1,10 +1,9 @@
-/* $Id: light.h,v 1.9 2001/02/06 04:06:35 keithw Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  7.5
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,91 +30,117 @@
 
 #include "mtypes.h"
 
-
-extern void
+extern void GLAPIENTRY
 _mesa_ShadeModel( GLenum mode );
 
-extern void
+extern void GLAPIENTRY
+_mesa_ProvokingVertexEXT(GLenum mode);
+
+
+#if _HAVE_FULL_GL
+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).
+ * 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 > SHINE_TABLE_SIZE-2) 						\
-      result = pow( dp, _tab->shininess );				\
+   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,
+                                      GLenum face, GLenum pname,
+                                      GLuint legal,
+                                      const char * );
 
-extern GLuint gl_material_bitmask( GLcontext *ctx,
-				   GLenum face, GLenum pname,
-				   GLuint legal,
-				   const char * );
+extern void _mesa_invalidate_spot_exp_table( struct gl_light *l );
 
-extern void gl_set_material( GLcontext *ctx, GLuint bitmask,
-                             const GLfloat *params);
+extern void _mesa_invalidate_shine_table( GLcontext *ctx, GLuint i );
 
+extern void _mesa_validate_all_lighting_tables( GLcontext *ctx );
 
-extern void gl_invalidate_spot_exp_table( struct gl_light *l );
-extern void gl_invalidate_shine_table( GLcontext *ctx, GLuint i );
-extern void gl_validate_all_lighting_tables( GLcontext *ctx );
+extern void _mesa_update_lighting( GLcontext *ctx );
 
+extern void _mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state );
 
-extern void gl_update_lighting( GLcontext *ctx );
+extern void _mesa_update_material( GLcontext *ctx,
+                                   GLuint bitmask );
 
-extern void gl_compute_light_positions( GLcontext *ctx );
+extern void _mesa_copy_materials( struct gl_material *dst,
+				  const struct gl_material *src,
+				  GLuint bitmask );
 
-extern void gl_update_material( GLcontext *ctx,
-				const struct gl_material src[2],
-				GLuint bitmask );
+extern void _mesa_update_color_material( GLcontext *ctx,
+                                         const GLfloat rgba[4] );
 
-extern void gl_update_color_material( GLcontext *ctx, const GLchan rgba[4] );
+extern void _mesa_init_lighting( GLcontext *ctx );
 
+extern void _mesa_free_lighting_data( GLcontext *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
 
+#endif