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

diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h
index 9c1a5eefadd..d009aa1759e 100644
--- a/src/mesa/main/light.h
+++ b/src/mesa/main/light.h
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.5
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
@@ -18,9 +17,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -28,16 +28,19 @@
 #define LIGHT_H
 
 
-#include "mtypes.h"
+#include "glheader.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 +82,26 @@ _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( GLcontext *ctx );
+extern void _mesa_update_lighting( struct gl_context *ctx );
 
-extern void _mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state );
+extern void _mesa_update_tnl_spaces( struct gl_context *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_free_lighting_data( GLcontext *ctx );
+extern void _mesa_init_lighting( 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