summaryrefslogtreecommitdiff
path: root/src/mesa/main/fog.c
diff options
context:
space:
mode:
authorJouk Jansen <joukj@hrem.stm.tudelft.nl>2006-03-29 12:09:08 +0000
committerJouk Jansen <joukj@hrem.stm.tudelft.nl>2006-03-29 12:09:08 +0000
commit180b0dab8b87ef7987b9f2c44068d1eea3f54939 (patch)
tree22a110a268b742f8821efc0e5b8680befcd1b0cf /src/mesa/main/fog.c
parenta85fbb1d36693158f1d5d3b6bbeb490185fc6bdf (diff)
Committing in .
Removing <CR> Modified Files: Mesa/src/mesa/main/fog.c Mesa/src/mesa/main/hint.c Mesa/src/mesa/main/mtypes.h ----------------------------------------------------------------------
Diffstat (limited to 'src/mesa/main/fog.c')
-rw-r--r--src/mesa/main/fog.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index df99c6519f..50a61bd84b 100644
--- 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);
-}
-
-
-#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);\
+}
+
+
+#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;
+ ctx->Fog.Start = *params;
UPDATE_FOG_SCALE(ctx);
break;
case GL_FOG_END:
if (ctx->Fog.End == *params)
return;
- FLUSH_VERTICES(ctx, _NEW_FOG);
- ctx->Fog.End = *params;
+ 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;
+ ctx->Fog.FogCoordinateSource = GL_FRAGMENT_DEPTH_EXT;
ctx->Fog._Scale = 1.0f;
}