Merge branch 'mesa_7_5_branch'

[mesa.git] / src / mesa / main / fog.c

diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index df99c6519f6b846ad97f37e8800da41b9e72b2c6..50a61bd84bff8bfac1cdfc7306be2a7a3b92062e 100644 (file)
--- a/src/mesa/main/fog.c
+++ b/src/mesa/main/fog.c
@@ -70,14 +70,14 @@ _mesa_Fogiv(GLenum pname, const GLint *params )
          ;
    }
    _mesa_Fogfv(pname, p);
-}\r
-\r
-\r
-#define UPDATE_FOG_SCALE(ctx) do {\\r
-      if (ctx->Fog.End == ctx->Fog.Start)\\r
-         ctx->Fog._Scale = 1.0f;\\r
-      else\\r
-         ctx->Fog._Scale = 1.0f / (ctx->Fog.End - ctx->Fog.Start);\\r
+}
+
+
+#define UPDATE_FOG_SCALE(ctx) do {\
+      if (ctx->Fog.End == ctx->Fog.Start)\
+         ctx->Fog._Scale = 1.0f;\
+      else\
+         ctx->Fog._Scale = 1.0f / (ctx->Fog.End - ctx->Fog.Start);\
    } while(0)
 
 
@@ -119,14 +119,14 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params )
          if (ctx->Fog.Start == *params)
             return;
          FLUSH_VERTICES(ctx, _NEW_FOG);
-         ctx->Fog.Start = *params;\r
+         ctx->Fog.Start = *params;
          UPDATE_FOG_SCALE(ctx);
          break;
       case GL_FOG_END:
          if (ctx->Fog.End == *params)
             return;
-         FLUSH_VERTICES(ctx, _NEW_FOG);\r
-         ctx->Fog.End = *params;\r
+         FLUSH_VERTICES(ctx, _NEW_FOG);
+         ctx->Fog.End = *params;
          UPDATE_FOG_SCALE(ctx);
          break;
       case GL_FOG_INDEX:
@@ -183,6 +183,6 @@ void _mesa_init_fog( GLcontext * ctx )
    ctx->Fog.Start = 0.0;
    ctx->Fog.End = 1.0;
    ctx->Fog.ColorSumEnabled = GL_FALSE;
-   ctx->Fog.FogCoordinateSource = GL_FRAGMENT_DEPTH_EXT;\r
+   ctx->Fog.FogCoordinateSource = GL_FRAGMENT_DEPTH_EXT;
    ctx->Fog._Scale = 1.0f;
 }