summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_pointtemp.h
diff options
context:
space:
mode:
authorKarl Schultz <[email protected]>2001-09-19 20:30:44 +0000
committerKarl Schultz <[email protected]>2001-09-19 20:30:44 +0000
commit7c4268176eaaeb45003db4d5042a518b84c9f6dc (patch)
tree7359bd33704a6bd32b471049be4744ce27db099f /src/mesa/swrast/s_pointtemp.h
parent2fc06af470da1929ac2fffc8d38a5d5ac87490bb (diff)
silence compiler warnings (last batch for src)
Diffstat (limited to 'src/mesa/swrast/s_pointtemp.h')
-rw-r--r--src/mesa/swrast/s_pointtemp.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_pointtemp.h b/src/mesa/swrast/s_pointtemp.h
index 1125d34ad68..482f42b8eb6 100644
--- a/src/mesa/swrast/s_pointtemp.h
+++ b/src/mesa/swrast/s_pointtemp.h
@@ -1,4 +1,4 @@
-/* $Id: s_pointtemp.h,v 1.9 2001/07/19 16:12:03 brianp Exp $ */
+/* $Id: s_pointtemp.h,v 1.10 2001/09/19 20:30:44 kschultz Exp $ */
/*
* Mesa 3-D graphics library
@@ -122,7 +122,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert )
#if FLAGS & SPRITE
{
SWcontext *swctx = SWRAST_CONTEXT(ctx);
- const GLfloat radius = 0.5 * vert->pointSize; /* XXX threshold, alpha */
+ const GLfloat radius = 0.5F * vert->pointSize; /* XXX threshold, alpha */
SWvertex v0, v1, v2, v3;
GLuint unit;
@@ -182,7 +182,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert )
#if FLAGS & SMOOTH
const GLfloat rmin = radius - 0.7071F; /* 0.7071 = sqrt(2)/2 */
const GLfloat rmax = radius + 0.7071F;
- const GLfloat rmin2 = MAX2(0.0, rmin * rmin);
+ const GLfloat rmin2 = MAX2(0.0F, rmin * rmin);
const GLfloat rmax2 = rmax * rmax;
const GLfloat cscale = 1.0F / (rmax2 - rmin2);
const GLint xmin = (GLint) (vert->win[0] - radius);