fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

more warning fixes (Karl Schultz)

Browse source
This commit is contained in:
Brian Paul 2001-09-15 18:02:49 +00:00
parent 1f20952a92
commit fde5e2c5f1
3 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mesa/main/clip.c
View file

@ -1,4 +1,4 @@
/* $Id: clip.c,v 1.22 2001/03/12 00:48:37 gareth Exp $ */
/* $Id: clip.c,v 1.23 2001/09/15 18:02:49 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -41,9 +41,6 @@
/**********************************************************************/
/* Get/Set User clip-planes. */
/**********************************************************************/
@ -64,10 +61,10 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
return;
}
equation[0] = eq[0];
equation[1] = eq[1];
equation[2] = eq[2];
equation[3] = eq[3];
equation[0] = (GLfloat) eq[0];
equation[1] = (GLfloat) eq[1];
equation[2] = (GLfloat) eq[2];
equation[3] = (GLfloat) eq[3];
/*
* The equation is transformed by the transpose of the inverse of the

6
src/mesa/main/colortab.c
View file

@ -1,4 +1,4 @@
/* $Id: colortab.c,v 1.41 2001/07/14 17:53:04 brianp Exp $ */
/* $Id: colortab.c,v 1.42 2001/09/15 18:02:49 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -1009,10 +1009,10 @@ _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
switch (pname) {
case GL_COLOR_TABLE_FORMAT:
*params = table->IntFormat;
*params = (GLfloat) table->IntFormat;
break;
case GL_COLOR_TABLE_WIDTH:
*params = table->Size;
*params = (GLfloat) table->Size;
break;
case GL_COLOR_TABLE_RED_SIZE:
*params = table->RedSize;

20
src/mesa/main/context.c
View file

@ -1,4 +1,4 @@
/* $Id: context.c,v 1.146 2001/07/26 20:02:10 brianp Exp $ */
/* $Id: context.c,v 1.147 2001/09/15 18:02:49 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -608,7 +608,7 @@ init_light( struct gl_light *l, GLuint n )
static void
init_lightmodel( struct gl_lightmodel *lm )
{
ASSIGN_4V( lm->Ambient, 0.2, 0.2, 0.2, 1.0 );
ASSIGN_4V( lm->Ambient, 0.2F, 0.2F, 0.2F, 1.0F );
lm->LocalViewer = GL_FALSE;
lm->TwoSide = GL_FALSE;
lm->ColorControl = GL_SINGLE_COLOR;
@ -618,10 +618,10 @@ init_lightmodel( struct gl_lightmodel *lm )
static void
init_material( struct gl_material *m )
{
ASSIGN_4V( m->Ambient, 0.2, 0.2, 0.2, 1.0 );
ASSIGN_4V( m->Diffuse, 0.8, 0.8, 0.8, 1.0 );
ASSIGN_4V( m->Specular, 0.0, 0.0, 0.0, 1.0 );
ASSIGN_4V( m->Emission, 0.0, 0.0, 0.0, 1.0 );
ASSIGN_4V( m->Ambient, 0.2F, 0.2F, 0.2F, 1.0F );
ASSIGN_4V( m->Diffuse, 0.8F, 0.8F, 0.8F, 1.0F );
ASSIGN_4V( m->Specular, 0.0F, 0.0F, 0.0F, 1.0F );
ASSIGN_4V( m->Emission, 0.0F, 0.0F, 0.0F, 1.0F );
m->Shininess = 0.0;
m->AmbientIndex = 0;
m->DiffuseIndex = 1;
@ -743,12 +743,12 @@ init_attrib_groups( GLcontext *ctx )
ctx->Const.MaxPointSize = MAX_POINT_SIZE;
ctx->Const.MinPointSizeAA = MIN_POINT_SIZE;
ctx->Const.MaxPointSizeAA = MAX_POINT_SIZE;
ctx->Const.PointSizeGranularity = POINT_SIZE_GRANULARITY;
ctx->Const.PointSizeGranularity = (GLfloat) POINT_SIZE_GRANULARITY;
ctx->Const.MinLineWidth = MIN_LINE_WIDTH;
ctx->Const.MaxLineWidth = MAX_LINE_WIDTH;
ctx->Const.MinLineWidthAA = MIN_LINE_WIDTH;
ctx->Const.MaxLineWidthAA = MAX_LINE_WIDTH;
ctx->Const.LineWidthGranularity = LINE_WIDTH_GRANULARITY;
ctx->Const.LineWidthGranularity = (GLfloat) LINE_WIDTH_GRANULARITY;
ctx->Const.NumAuxBuffers = NUM_AUX_BUFFERS;
ctx->Const.MaxColorTableSize = MAX_COLOR_TABLE_SIZE;
ctx->Const.MaxConvolutionWidth = MAX_CONVOLUTION_WIDTH;
@ -1159,8 +1159,8 @@ init_attrib_groups( GLcontext *ctx )
#define Sz 10
#define Tz 14
ctx->Viewport._WindowMap.m[Sz] = 0.5 * ctx->DepthMaxF;
ctx->Viewport._WindowMap.m[Tz] = 0.5 * ctx->DepthMaxF;
ctx->Viewport._WindowMap.m[Sz] = 0.5F * ctx->DepthMaxF;
ctx->Viewport._WindowMap.m[Tz] = 0.5F * ctx->DepthMaxF;
#undef Sz
#undef Tz