diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-03-01 01:50:20 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-03-01 01:50:20 +0000 |
| commit | 27558a160a9fe91745728d7626995cd88f8fe339 (patch) | |
| tree | 0b8cbbd49d418f5ef9f10d3d721c3d4e9e925c3d /src/mesa/main/rastpos.c | |
| parent | 4e50ab5f70582f4e362c4572b22a4c3f87c71a14 (diff) | |
Killed mmath.[ch]. Moved low-level functions/assembly code into imports.[ch]
Moved type conversion and interpolation macros into macros.h
Updated all the files that used to include mmath.h
Diffstat (limited to 'src/mesa/main/rastpos.c')
| -rw-r--r-- | src/mesa/main/rastpos.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index bb03c45697..2ca7b22a9b 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -1,10 +1,10 @@ -/* $Id: rastpos.c,v 1.39 2002/10/24 23:57:21 brianp Exp $ */ +/* $Id: rastpos.c,v 1.40 2003/03/01 01:50:22 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 5.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"), @@ -32,7 +32,6 @@ #include "feedback.h" #include "light.h" #include "macros.h" -#include "mmath.h" #include "rastpos.h" #include "state.h" #include "simple_list.h" @@ -321,8 +320,8 @@ raster_pos4f(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat w) if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT) ctx->Current.RasterDistance = ctx->Current.Attrib[VERT_ATTRIB_FOG][0]; else - ctx->Current.RasterDistance = (GLfloat) - GL_SQRT( eye[0]*eye[0] + eye[1]*eye[1] + eye[2]*eye[2] ); + ctx->Current.RasterDistance = + SQRTF( eye[0]*eye[0] + eye[1]*eye[1] + eye[2]*eye[2] ); /* apply projection matrix: clip = Proj * eye */ TRANSFORM_POINT( clip, ctx->ProjectionMatrixStack.Top->m, eye ); |