diff options
Diffstat (limited to 'src/mesa/main/light.h')
| -rw-r--r-- | src/mesa/main/light.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h index 4c2589fbf47..134e3782e58 100644 --- a/src/mesa/main/light.h +++ b/src/mesa/main/light.h @@ -1,21 +1,21 @@ -/* $Id: light.h,v 1.5 2000/11/16 21:05:35 keithw Exp $ */ +/* $Id: light.h,v 1.6 2000/11/22 07:32:17 joukj Exp $ */ /* * Mesa 3-D graphics library * Version: 3.5 - * + * * Copyright (C) 1999-2000 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"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. - * + * * 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 @@ -29,7 +29,7 @@ #define LIGHT_H -#include "types.h" +#include "mtypes.h" extern void @@ -89,7 +89,7 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *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). + * still pretty good compared to a straight lookup). */ #define GET_SHINE_TAB_ENTRY( table, dp, result ) \ do { \ @@ -105,8 +105,8 @@ do { \ -extern GLuint gl_material_bitmask( GLcontext *ctx, - GLenum face, GLenum pname, +extern GLuint gl_material_bitmask( GLcontext *ctx, + GLenum face, GLenum pname, GLuint legal, const char * ); @@ -115,15 +115,15 @@ extern void gl_set_material( GLcontext *ctx, GLuint bitmask, extern void gl_compute_spot_exp_table( struct gl_light *l ); -extern void gl_compute_shine_table( GLcontext *ctx, GLuint i, +extern void gl_compute_shine_table( GLcontext *ctx, GLuint i, GLfloat shininess ); extern void gl_update_lighting( GLcontext *ctx ); extern void gl_compute_light_positions( GLcontext *ctx ); -extern void gl_update_material( GLcontext *ctx, - const struct gl_material src[2], +extern void gl_update_material( GLcontext *ctx, + const struct gl_material src[2], GLuint bitmask ); extern void gl_update_color_material( GLcontext *ctx, const GLchan rgba[4] ); |