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/swrast/s_texture.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/swrast/s_texture.c')
| -rw-r--r-- | src/mesa/swrast/s_texture.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c index f99075fc54..e63f49c742 100644 --- a/src/mesa/swrast/s_texture.c +++ b/src/mesa/swrast/s_texture.c @@ -1,4 +1,4 @@ -/* $Id: s_texture.c,v 1.81 2003/02/27 19:40:45 kschultz Exp $ */ +/* $Id: s_texture.c,v 1.82 2003/03/01 01:50:26 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -29,7 +29,6 @@ #include "context.h" #include "colormac.h" #include "macros.h" -#include "mmath.h" #include "imports.h" #include "texformat.h" #include "teximage.h" @@ -2065,7 +2064,7 @@ choose_cube_face(const struct gl_texture_object *texObj, const GLfloat ry = texcoord[1]; const GLfloat rz = texcoord[2]; const struct gl_texture_image **imgArray; - const GLfloat arx = ABSF(rx), ary = ABSF(ry), arz = ABSF(rz); + const GLfloat arx = FABSF(rx), ary = FABSF(ry), arz = FABSF(rz); GLfloat sc, tc, ma; if (arx > ary && arx > arz) { |