projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: fix signed/unsigned sscanf() warning in _mesa_override_glsl_version()
[mesa.git]
/
src
/
mesa
/
main
/
light.c
diff --git
a/src/mesa/main/light.c
b/src/mesa/main/light.c
index 43ae28c25abe8f14876a9bda771a39595dc1e7a8..c27cf1dd38b0a44661506c0037478426c4aea82c 100644
(file)
--- a/
src/mesa/main/light.c
+++ b/
src/mesa/main/light.c
@@
-103,7
+103,7
@@
_mesa_ProvokingVertexEXT(GLenum mode)
* Also, all error checking should have already been done.
*/
void
* Also, all error checking should have already been done.
*/
void
-_mesa_light(
GL
context *ctx, GLuint lnum, GLenum pname, const GLfloat *params)
+_mesa_light(
struct gl_
context *ctx, GLuint lnum, GLenum pname, const GLfloat *params)
{
struct gl_light *light;
{
struct gl_light *light;
@@
-569,7
+569,7
@@
_mesa_LightModelf( GLenum pname, GLfloat param )
* of the targeted material values.
*/
GLuint
* of the targeted material values.
*/
GLuint
-_mesa_material_bitmask(
GL
context *ctx, GLenum face, GLenum pname,
+_mesa_material_bitmask(
struct gl_
context *ctx, GLenum face, GLenum pname,
GLuint legal, const char *where )
{
GLuint bitmask = 0;
GLuint legal, const char *where )
{
GLuint bitmask = 0;
@@
-643,7
+643,7
@@
_mesa_copy_materials( struct gl_material *dst,
/* Update derived values following a change in ctx->Light.Material
*/
void
/* Update derived values following a change in ctx->Light.Material
*/
void
-_mesa_update_material(
GL
context *ctx, GLuint bitmask )
+_mesa_update_material(
struct gl_
context *ctx, GLuint bitmask )
{
struct gl_light *light, *list = &ctx->Light.EnabledList;
GLfloat (*mat)[4] = ctx->Light.Material.Attrib;
{
struct gl_light *light, *list = &ctx->Light.EnabledList;
GLfloat (*mat)[4] = ctx->Light.Material.Attrib;
@@
-728,7
+728,7
@@
_mesa_update_material( GLcontext *ctx, GLuint bitmask )
* set by glColorMaterial().
*/
void
* set by glColorMaterial().
*/
void
-_mesa_update_color_material(
GL
context *ctx, const GLfloat color[4] )
+_mesa_update_color_material(
struct gl_
context *ctx, const GLfloat color[4] )
{
GLuint bitmask = ctx->Light.ColorMaterialBitmask;
struct gl_material *mat = &ctx->Light.Material;
{
GLuint bitmask = ctx->Light.ColorMaterialBitmask;
struct gl_material *mat = &ctx->Light.Material;
@@
-972,7
+972,7
@@
validate_spot_exp_table( struct gl_light *l )
* by keeping a MRU cache of shine tables for various shine values.
*/
void
* by keeping a MRU cache of shine tables for various shine values.
*/
void
-_mesa_invalidate_shine_table(
GL
context *ctx, GLuint side )
+_mesa_invalidate_shine_table(
struct gl_
context *ctx, GLuint side )
{
ASSERT(side < 2);
if (ctx->_ShineTable[side])
{
ASSERT(side < 2);
if (ctx->_ShineTable[side])
@@
-982,7
+982,7
@@
_mesa_invalidate_shine_table( GLcontext *ctx, GLuint side )
static void
static void
-validate_shine_table(
GL
context *ctx, GLuint side, GLfloat shininess )
+validate_shine_table(
struct gl_
context *ctx, GLuint side, GLfloat shininess )
{
struct gl_shine_tab *list = ctx->_ShineTabList;
struct gl_shine_tab *s;
{
struct gl_shine_tab *list = ctx->_ShineTabList;
struct gl_shine_tab *s;
@@
-1034,7
+1034,7
@@
validate_shine_table( GLcontext *ctx, GLuint side, GLfloat shininess )
void
void
-_mesa_validate_all_lighting_tables(
GL
context *ctx )
+_mesa_validate_all_lighting_tables(
struct gl_
context *ctx )
{
GLuint i;
GLfloat shininess;
{
GLuint i;
GLfloat shininess;
@@
-1060,7
+1060,7
@@
_mesa_validate_all_lighting_tables( GLcontext *ctx )
* source and material ambient, diffuse and specular coefficients.
*/
void
* source and material ambient, diffuse and specular coefficients.
*/
void
-_mesa_update_lighting(
GL
context *ctx )
+_mesa_update_lighting(
struct gl_
context *ctx )
{
struct gl_light *light;
ctx->Light._NeedEyeCoords = GL_FALSE;
{
struct gl_light *light;
ctx->Light._NeedEyeCoords = GL_FALSE;
@@
-1123,7
+1123,7
@@
_mesa_update_lighting( GLcontext *ctx )
* Also update on lighting space changes.
*/
static void
* Also update on lighting space changes.
*/
static void
-compute_light_positions(
GL
context *ctx )
+compute_light_positions(
struct gl_
context *ctx )
{
struct gl_light *light;
static const GLfloat eye_z[3] = { 0, 0, 1 };
{
struct gl_light *light;
static const GLfloat eye_z[3] = { 0, 0, 1 };
@@
-1210,7
+1210,7
@@
compute_light_positions( GLcontext *ctx )
static void
static void
-update_modelview_scale(
GL
context *ctx )
+update_modelview_scale(
struct gl_
context *ctx )
{
ctx->_ModelViewInvScale = 1.0F;
if (!_math_matrix_is_length_preserving(ctx->ModelviewMatrixStack.Top)) {
{
ctx->_ModelViewInvScale = 1.0F;
if (!_math_matrix_is_length_preserving(ctx->ModelviewMatrixStack.Top)) {
@@
-1229,7
+1229,7
@@
update_modelview_scale( GLcontext *ctx )
* Bring up to date any state that relies on _NeedEyeCoords.
*/
void
* Bring up to date any state that relies on _NeedEyeCoords.
*/
void
-_mesa_update_tnl_spaces(
GL
context *ctx, GLuint new_state )
+_mesa_update_tnl_spaces(
struct gl_
context *ctx, GLuint new_state )
{
const GLuint oldneedeyecoords = ctx->_NeedEyeCoords;
{
const GLuint oldneedeyecoords = ctx->_NeedEyeCoords;
@@
-1278,7
+1278,7
@@
_mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state )
* light-in-modelspace optimization. It's also useful for debugging.
*/
void
* light-in-modelspace optimization. It's also useful for debugging.
*/
void
-_mesa_allow_light_in_model(
GL
context *ctx, GLboolean flag )
+_mesa_allow_light_in_model(
struct gl_
context *ctx, GLboolean flag )
{
ctx->_ForceEyeCoords = !flag;
ctx->NewState |= _NEW_POINT; /* one of the bits from
{
ctx->_ForceEyeCoords = !flag;
ctx->NewState |= _NEW_POINT; /* one of the bits from
@@
-1370,7
+1370,7
@@
init_material( struct gl_material *m )
* Initialize all lighting state for the given context.
*/
void
* Initialize all lighting state for the given context.
*/
void
-_mesa_init_lighting(
GL
context *ctx )
+_mesa_init_lighting(
struct gl_
context *ctx )
{
GLuint i;
{
GLuint i;
@@
-1418,7
+1418,7
@@
_mesa_init_lighting( GLcontext *ctx )
* Deallocate malloc'd lighting state attached to given context.
*/
void
* Deallocate malloc'd lighting state attached to given context.
*/
void
-_mesa_free_lighting_data(
GL
context *ctx )
+_mesa_free_lighting_data(
struct gl_
context *ctx )
{
struct gl_shine_tab *s, *tmps;
{
struct gl_shine_tab *s, *tmps;