diff options
author | Brian Paul <[email protected]> | 2003-03-01 01:50:20 +0000 |
---|---|---|
committer | Brian Paul <[email protected]> | 2003-03-01 01:50:20 +0000 |
commit | 27558a160a9fe91745728d7626995cd88f8fe339 (patch) | |
tree | 0b8cbbd49d418f5ef9f10d3d721c3d4e9e925c3d /src/mesa/tnl/t_vb_fog.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/tnl/t_vb_fog.c')
-rw-r--r-- | src/mesa/tnl/t_vb_fog.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mesa/tnl/t_vb_fog.c b/src/mesa/tnl/t_vb_fog.c index 0464e5b256b..dedd4c53029 100644 --- a/src/mesa/tnl/t_vb_fog.c +++ b/src/mesa/tnl/t_vb_fog.c @@ -1,10 +1,10 @@ -/* $Id: t_vb_fog.c,v 1.19 2002/10/29 20:29:03 brianp Exp $ */ +/* $Id: t_vb_fog.c,v 1.20 2003/03/01 01:50:27 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"), @@ -33,7 +33,6 @@ #include "context.h" #include "macros.h" #include "imports.h" -#include "mmath.h" #include "mtypes.h" #include "math/m_xform.h" @@ -105,14 +104,14 @@ static void make_win_fog_coords( GLcontext *ctx, GLvector4f *out, else d = 1.0F / (ctx->Fog.End - ctx->Fog.Start); for ( i = 0 ; i < n ; i++, STRIDE_F(v, stride)) { - GLfloat f = (end - ABSF(*v)) * d; + GLfloat f = (end - FABSF(*v)) * d; data[i][0] = CLAMP(f, 0.0F, 1.0F); } break; case GL_EXP: d = ctx->Fog.Density; for ( i = 0 ; i < n ; i++, STRIDE_F(v,stride)) - NEG_EXP( data[i][0], d * ABSF(*v) ); + NEG_EXP( data[i][0], d * FABSF(*v) ); break; case GL_EXP2: d = ctx->Fog.Density*ctx->Fog.Density; |