more clean-ups

[mesa.git] / src / mesa / swrast / s_pointtemp.h

diff --git a/src/mesa/swrast/s_pointtemp.h b/src/mesa/swrast/s_pointtemp.h
index cf45dcde8254bc6cd80165f2c005a7669aa31ea4..f7bd1240b15d8aad694772daacd0c543311309b3 100644 (file)
--- a/src/mesa/swrast/s_pointtemp.h
+++ b/src/mesa/swrast/s_pointtemp.h
@@ -1,8 +1,8 @@
-/* $Id: s_pointtemp.h,v 1.19 2002/10/04 17:37:47 brianp Exp $ */
+/* $Id: s_pointtemp.h,v 1.21 2002/11/09 21:26:41 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  5.0
  *
  * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
  *
@@ -117,7 +117,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert )
    for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
       if (ctx->Texture.Unit[u]._ReallyEnabled) {
          const GLfloat q = vert->texcoord[u][3];
-         const GLfloat invQ = (q == 0.0 || q == 1.0) ? 1.0 : (1.0 / q);
+         const GLfloat invQ = (q == 0.0F || q == 1.0F) ? 1.0F : (1.0F / q);
          texcoord[u][0] = vert->texcoord[u][0] * invQ;
          texcoord[u][1] = vert->texcoord[u][1] * invQ;
          texcoord[u][2] = vert->texcoord[u][2] * invQ;
@@ -153,7 +153,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert )
    {{
       GLint x, y;
       const GLfloat radius = 0.5F * size;
-      const GLint z = (GLint) (vert->win[2]);
+      const GLint z = (GLint) (vert->win[2] + 0.5F);
       GLuint count;
 #if FLAGS & SMOOTH
       const GLfloat rmin = radius - 0.7071F;  /* 0.7071 = sqrt(2)/2 */
@@ -359,7 +359,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert )
 
       span->array->x[count] = (GLint) vert->win[0];
       span->array->y[count] = (GLint) vert->win[1];
-      span->array->z[count] = (GLint) vert->win[2];
+      span->array->z[count] = (GLint) (vert->win[2] + 0.5F);
       span->end = count + 1;
    }}