commit f9c574d7192d2193ff3e12629a8db1a74b6dbf55
author Michal Krol <michal@tungstengraphics.com> Tue Jul 15 11:44:47 2008 +0200
committer Michal Krol <michal@tungstengraphics.com> Tue Jul 15 11:49:02 2008 +0200
tree cb128f689d953fc8b8fa21cd990ef478dfe757a6
parent 6c534b830c6f5427c391c5225c34561141c201ba

mesa: Silence compiler warnings on Windows.

src/mesa/shader/prog_statevars.c

diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index 7e444de..81bb412 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -249,7 +249,7 @@
       value[1] = ctx->Fog.Start;
       value[2] = ctx->Fog.End;
       value[3] = (ctx->Fog.End == ctx->Fog.Start)
-         ? 1.0 : (GLfloat)(1.0 / (ctx->Fog.End - ctx->Fog.Start));
+         ? 1.0f : (GLfloat)(1.0 / (ctx->Fog.End - ctx->Fog.Start));
       return;
    case STATE_CLIPPLANE:
       {
@@ -409,9 +409,9 @@
                = ctx->Texture.Unit[unit]._Current;
             if (texObj) {
                struct gl_texture_image *texImage = texObj->Image[0][0];
-               ASSIGN_4V(value, 1.0 / texImage->Width,
+               ASSIGN_4V(value, (GLfloat) (1.0 / texImage->Width),
                          (GLfloat)(1.0 / texImage->Height),
-                         0.0, 1.0);
+                         0.0f, 1.0f);
             }
          }
          return;
@@ -425,7 +425,7 @@
           * exp2: 2^-((density/(ln(2)^2) * fogcoord)^2)
           */
          value[0] = (ctx->Fog.End == ctx->Fog.Start)
-            ? 1.0 : (GLfloat)(-1.0F / (ctx->Fog.End - ctx->Fog.Start));
+            ? 1.0f : (GLfloat)(-1.0F / (ctx->Fog.End - ctx->Fog.Start));
          value[1] = ctx->Fog.End * -value[0];
          value[2] = (GLfloat)(ctx->Fog.Density * ONE_DIV_LN2);
          value[3] = (GLfloat)(ctx->Fog.Density * ONE_DIV_SQRT_LN2);