texFormat was a random value in _mesa_store_teximage3d(), fix by undoing last changes

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

diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h
index 604e4d5806e42703e6594313de3b9acfe4c14ab7..82b6d74a5521865004795aed712b5d77fbc1f99f 100644 (file)
--- a/src/mesa/main/light.h
+++ b/src/mesa/main/light.h
@@ -1,10 +1,10 @@
-/* $Id: light.h,v 1.7 2000/11/24 10:25:05 keithw Exp $ */
+/* $Id: light.h,v 1.12 2001/03/12 00:48:38 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  Brian Paul   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"),
@@ -82,40 +82,41 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params );
 #define GET_SHINE_TAB_ENTRY( table, dp, result )                       \
 do {                                                                   \
    struct gl_shine_tab *_tab = table;                                  \
-   if (dp>1.0)                                                         \
+   float f = (dp * (SHINE_TABLE_SIZE-1));                              \
+   int k = (int) f;                                                    \
+   if (k > SHINE_TABLE_SIZE-2)                                                 \
       result = pow( dp, _tab->shininess );                             \
-   else {                                                              \
-      float f = (dp * (SHINE_TABLE_SIZE-1));                           \
-      int k = (int) f;                                                 \
+   else                                                                        \
       result = _tab->tab[k] + (f-k)*(_tab->tab[k+1]-_tab->tab[k]);     \
-   }                                                                   \
 } while (0)
 
 
 
-extern GLuint gl_material_bitmask( GLcontext *ctx,
-                                  GLenum face, GLenum pname,
-                                  GLuint legal,
-                                  const char * );
+extern GLuint _mesa_material_bitmask( GLcontext *ctx,
+                                      GLenum face, GLenum pname,
+                                      GLuint legal,
+                                      const char * );
 
-extern void gl_set_material( GLcontext *ctx, GLuint bitmask,
-                             const GLfloat *params);
+extern void _mesa_invalidate_spot_exp_table( struct gl_light *l );
 
-extern void gl_compute_spot_exp_table( struct gl_light *l );
+extern void _mesa_invalidate_shine_table( GLcontext *ctx, GLuint i );
 
-extern void gl_compute_shine_table( GLcontext *ctx, GLuint i,
-                                   GLfloat shininess );
+extern void _mesa_validate_all_lighting_tables( GLcontext *ctx );
 
-extern void gl_update_lighting( GLcontext *ctx );
+extern void _mesa_update_lighting( GLcontext *ctx );
 
-extern void gl_compute_light_positions( GLcontext *ctx );
+extern void _mesa_compute_light_positions( GLcontext *ctx );
 
-extern void gl_update_material( GLcontext *ctx,
-                               const struct gl_material src[2],
-                               GLuint bitmask );
+extern void _mesa_update_material( GLcontext *ctx,
+                                   const struct gl_material src[2],
+                                   GLuint bitmask );
 
-extern void gl_update_color_material( GLcontext *ctx, const GLchan rgba[4] );
+extern void _mesa_copy_material_pairs( struct gl_material dst[2],
+                                       const struct gl_material src[2],
+                                       GLuint bitmask );
 
+extern void _mesa_update_color_material( GLcontext *ctx,
+                                         const GLchan rgba[4] );
 
-#endif
 
+#endif