From 78023e980891954ab1cd08a25dc3bac521220098 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 9 May 2001 17:21:51 +0000
Subject: don't call _mesa_win_fog_coords_from_z() if fog is disabled, fixes FP
 exception

---
 src/mesa/swrast/s_bitmap.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/mesa/swrast/s_bitmap.c')

diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c
index d91319c01b8..aee5f7a0885 100644
--- a/src/mesa/swrast/s_bitmap.c
+++ b/src/mesa/swrast/s_bitmap.c
@@ -1,4 +1,4 @@
-/* $Id: s_bitmap.c,v 1.8 2001/05/03 22:13:32 brianp Exp $ */
+/* $Id: s_bitmap.c,v 1.9 2001/05/09 17:21:51 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -74,7 +74,10 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
 
    fragZ = (GLdepth) ( ctx->Current.RasterPos[2] * ctx->DepthMaxF);
 
-   _mesa_win_fog_coords_from_z( ctx, 1, &fragZ, &fogCoord );
+   if (ctx->Fog.Enabled)
+      _mesa_win_fog_coords_from_z( ctx, 1, &fragZ, &fogCoord );
+   else
+      fogCoord = 0.0;
 
    for (row=0; row<height; row++) {
       const GLubyte *src = (const GLubyte *) _mesa_image_address( unpack,
-- 
cgit v1.2.3