diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-09-15 18:02:49 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-09-15 18:02:49 +0000 |
| commit | fde5e2c5f182759aff78bdd12e6c928f3f13bbdc (patch) | |
| tree | 950881e6db4ba7f6676f3ce7e4dcd996c419555f /src/mesa/main/context.c | |
| parent | 1f20952a92aa8b8fe000222a9c71086df8fc63d8 (diff) | |
more warning fixes (Karl Schultz)
Diffstat (limited to 'src/mesa/main/context.c')
| -rw-r--r-- | src/mesa/main/context.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 7576c8bc2c..91d6c04c56 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -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 |