summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-02-21 21:01:14 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-02-21 21:01:14 +0000
commit5e4a96980ed5e703ffae4b8d0cd18c8aafb23bca (patch)
treeb04f5bec77ab0b23b46908aa35191f0a30750449
parent6397f53174897bd4c41e17fd2d333ba273c314f4 (diff)
use IROUND to convert depth values from float to int (bug 690728)
-rw-r--r--src/mesa/swrast/s_aalinetemp.h8
-rw-r--r--src/mesa/swrast/s_aatritemp.h10
2 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/swrast/s_aalinetemp.h b/src/mesa/swrast/s_aalinetemp.h
index 4fffd0423ed..5fbc99cfb4c 100644
--- a/src/mesa/swrast/s_aalinetemp.h
+++ b/src/mesa/swrast/s_aalinetemp.h
@@ -1,10 +1,10 @@
-/* $Id: s_aalinetemp.h,v 1.21 2002/08/07 00:45:07 brianp Exp $ */
+/* $Id: s_aalinetemp.h,v 1.21.4.1 2003/02/21 21:01:18 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 5.0.1
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -54,7 +54,7 @@ NAME(plot)(GLcontext *ctx, struct LineInfo *line, int ix, int iy)
* solving the plane equations at (ix,iy).
*/
#ifdef DO_Z
- line->span.array->z[i] = (GLdepth) solve_plane(fx, fy, line->zPlane);
+ line->span.array->z[i] = (GLdepth) IROUND(solve_plane(fx, fy, line->zPlane));
#endif
#ifdef DO_FOG
line->span.array->fog[i] = solve_plane(fx, fy, line->fPlane);
diff --git a/src/mesa/swrast/s_aatritemp.h b/src/mesa/swrast/s_aatritemp.h
index 0a70cf184f2..b0be1391ed1 100644
--- a/src/mesa/swrast/s_aatritemp.h
+++ b/src/mesa/swrast/s_aatritemp.h
@@ -1,10 +1,10 @@
-/* $Id: s_aatritemp.h,v 1.30 2002/08/07 00:45:07 brianp Exp $ */
+/* $Id: s_aatritemp.h,v 1.30.4.1 2003/02/21 21:01:14 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 5.0.1
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -291,7 +291,7 @@
array->coverage[count] = coverage;
#endif
#ifdef DO_Z
- array->z[count] = (GLdepth) solve_plane(cx, cy, zPlane);
+ array->z[count] = (GLdepth) IROUND(solve_plane(cx, cy, zPlane));
#endif
#ifdef DO_FOG
array->fog[count] = solve_plane(cx, cy, fogPlane);
@@ -397,7 +397,7 @@
array->coverage[ix] = coverage;
#endif
#ifdef DO_Z
- array->z[ix] = (GLdepth) solve_plane(cx, cy, zPlane);
+ array->z[ix] = (GLdepth) IROUND(solve_plane(cx, cy, zPlane));
#endif
#ifdef DO_FOG
array->fog[ix] = solve_plane(cx, cy, fogPlane);