From: Daniel Borca <dborca@users.sourceforge.net>
Date: Mon, 15 Nov 2004 08:04:33 +0000 (+0000)
Subject: use float constants
X-Git-Tag: android-x86-1.6~6319
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=37918cf3d9b75fe924d05e2c8c80216c3f2c6944;p=android-x86%2Fexternal-mesa.git

use float constants
---

diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index d22f238af5a..b3707fcffcc 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -857,13 +857,13 @@ fxt1_quantize_ALPHA1 (unsigned long *cc,
    for (j = n_vect - 1; j >= 0; j--) {
       /* add in alphas */
       FX64_SHL(hi, 5);
-      FX64_OR32(hi, (unsigned int)(vec[j][ACOMP] / 8.0));
+      FX64_OR32(hi, (unsigned int)(vec[j][ACOMP] / 8.0F));
    }
    for (j = n_vect - 1; j >= 0; j--) {
       for (i = 0; i < n_comp - 1; i++) {
          /* add in colors */
          FX64_SHL(hi, 5);
-         FX64_OR32(hi, (unsigned int)(vec[j][i] / 8.0));
+         FX64_OR32(hi, (unsigned int)(vec[j][i] / 8.0F));
       }
    }
    ((Fx64 *)cc)[1] = hi;
@@ -1358,7 +1358,7 @@ fxt1_encode (unsigned int width, unsigned int height, int comps,
       int newHeight = (height + 3) & ~3;
       newSource = malloc(comps * newWidth * newHeight * sizeof(unsigned char *));
       _mesa_upscale_teximage2d(width, height, newWidth, newHeight,
-                          comps, source, srcRowStride, newSource);
+                               comps, source, srcRowStride, newSource);
       source = newSource;
       width = newWidth;
       height = newHeight;