diff options
author | marha <marha@users.sourceforge.net> | 2012-09-04 15:49:46 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-09-04 15:49:46 +0200 |
commit | f2c10b20ce3f657c1f2013057602bb439816940f (patch) | |
tree | 4f86053b9b636d2d0174e229e79f2bb9d0a6f1a7 /mesalib/src/mesa/tnl/t_rasterpos.c | |
parent | b3bc6204173252cae91fd40659c0eb01e4c75c99 (diff) | |
parent | 67c4614f29188e4af86e1d88ee82759c896b70b5 (diff) | |
download | vcxsrv-f2c10b20ce3f657c1f2013057602bb439816940f.tar.gz vcxsrv-f2c10b20ce3f657c1f2013057602bb439816940f.tar.bz2 vcxsrv-f2c10b20ce3f657c1f2013057602bb439816940f.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_ext.c
libxcb/src/xcb_xid.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/eval.c
mesalib/src/mesa/main/imports.h
mesalib/src/mesa/main/macros.h
Diffstat (limited to 'mesalib/src/mesa/tnl/t_rasterpos.c')
-rw-r--r-- | mesalib/src/mesa/tnl/t_rasterpos.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/tnl/t_rasterpos.c b/mesalib/src/mesa/tnl/t_rasterpos.c index a28ad0daf..1673b81ef 100644 --- a/mesalib/src/mesa/tnl/t_rasterpos.c +++ b/mesalib/src/mesa/tnl/t_rasterpos.c @@ -429,7 +429,7 @@ _tnl_RasterPos(struct gl_context *ctx, const GLfloat vObj[4]) ctx->Current.RasterDistance = ctx->Current.Attrib[VERT_ATTRIB_FOG][0]; else ctx->Current.RasterDistance = - SQRTF( eye[0]*eye[0] + eye[1]*eye[1] + eye[2]*eye[2] ); + sqrtf( eye[0]*eye[0] + eye[1]*eye[1] + eye[2]*eye[2] ); /* compute transformed normal vector (for lighting or texgen) */ if (ctx->_NeedEyeCoords) { |