aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program/prog_statevars.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-09-11 11:15:52 +0200
committermarha <marha@users.sourceforge.net>2013-09-11 11:15:52 +0200
commit1de316b38f589817344e1a342050de4c427501df (patch)
treede3ec426a2a640a021b17ea55da8d71a07a8a412 /mesalib/src/mesa/program/prog_statevars.c
parent41665774749bc54dcd635ebbaab045a4350d5b2f (diff)
parenta7d3f63ee5e292379ed6d6eba0c65512205a4786 (diff)
downloadvcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.gz
vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.bz2
vcxsrv-1de316b38f589817344e1a342050de4c427501df.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesa pixman git update 11 Sep 2013 Conflicts: pixman/pixman/pixman-sse2.c
Diffstat (limited to 'mesalib/src/mesa/program/prog_statevars.c')
-rw-r--r--mesalib/src/mesa/program/prog_statevars.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/src/mesa/program/prog_statevars.c b/mesalib/src/mesa/program/prog_statevars.c
index f6073be13..145c07c67 100644
--- a/mesalib/src/mesa/program/prog_statevars.c
+++ b/mesalib/src/mesa/program/prog_statevars.c
@@ -256,8 +256,7 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[],
value[0] = ctx->Fog.Density;
value[1] = ctx->Fog.Start;
value[2] = ctx->Fog.End;
- value[3] = (ctx->Fog.End == ctx->Fog.Start)
- ? 1.0f : (GLfloat)(1.0 / (ctx->Fog.End - ctx->Fog.Start));
+ value[3] = 1.0f / (ctx->Fog.End - ctx->Fog.Start);
return;
case STATE_CLIPPLANE:
{