projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7b9ff48
)
don't call _mesa_win_fog_coords_from_z() if fog is disabled, fixes FP exception
author
Brian Paul
<brian.paul@tungstengraphics.com>
Wed, 9 May 2001 17:21:51 +0000
(17:21 +0000)
committer
Brian Paul
<brian.paul@tungstengraphics.com>
Wed, 9 May 2001 17:21:51 +0000
(17:21 +0000)
src/mesa/swrast/s_bitmap.c
patch
|
blob
|
history
diff --git
a/src/mesa/swrast/s_bitmap.c
b/src/mesa/swrast/s_bitmap.c
index
d91319c
..
aee5f7a
100644
(file)
--- 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,