mesa: Move [UN]CLAMPED_FLOAT_TO_UBYTE from imports.h to macros.h.

[mesa.git] / src / mesa / drivers / dri / r128 / r128_tex.c

diff --git a/src/mesa/drivers/dri/r128/r128_tex.c b/src/mesa/drivers/dri/r128/r128_tex.c
index f1be7cc1c4f41e297de5cb7f9c9e546deaea9aac..b5a19b510af49c0923a7d138c60113e45b3fbdba 100644 (file)
--- a/src/mesa/drivers/dri/r128/r128_tex.c
+++ b/src/mesa/drivers/dri/r128/r128_tex.c
@@ -33,22 +33,18 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "r128_context.h"
-#include "r128_state.h"
 #include "r128_ioctl.h"
-#include "r128_tris.h"
 #include "r128_tex.h"
 #include "r128_texobj.h"
 
-#include "main/context.h"
-#include "main/macros.h"
 #include "main/simple_list.h"
 #include "main/enums.h"
 #include "main/texstore.h"
 #include "main/teximage.h"
 #include "main/texobj.h"
 #include "main/imports.h"
-#include "main/colormac.h"
 #include "main/texobj.h"
+#include "main/macros.h"
 
 #include "xmlpool.h"
 
@@ -473,7 +469,7 @@ static void r128TexEnv( GLcontext *ctx, GLenum target,
          * certain point.  It is better than completely ignoring the LOD
          * bias.  Unfortunately there isn't much range in the bias, the
          * spec mentions strides that vary between 0.5 and 2.0 but these
-         * numbers don't seem to relate the the GL LOD bias value at all.
+         * numbers don't seem to relate to the GL LOD bias value at all.
          */
         if ( param[0] >= 1.0 ) {
            bias = -128;