summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorDaniel Borca <dborca@users.sourceforge.net>2004-08-30 09:05:01 +0000
committerDaniel Borca <dborca@users.sourceforge.net>2004-08-30 09:05:01 +0000
commit7a42f1562d74e631616e03aed20190a27c22859b (patch)
tree6ecdeb4d7a0e9af6e42eee6ff19412739d15a69f /src/mesa
parent5b2434c5d1fea37889d4e854041dee9ba236cbfc (diff)
revived unused code, but got rid of warnings
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/texcompress_fxt1.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index 3aa5e66398..c33a003737 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -295,9 +295,9 @@ const struct gl_texture_format _mesa_texformat_rgba_fxt1 = {
typedef unsigned long long Fx64;
-#define FX64_MOV32(a, b) a = b;
-#define FX64_OR32(a, b) a |= b;
-#define FX64_SHL(a, c) a <<= c;
+#define FX64_MOV32(a, b) a = b
+#define FX64_OR32(a, b) a |= b
+#define FX64_SHL(a, c) a <<= c
#else /* !__GNUC__ */
@@ -323,7 +323,6 @@ typedef struct {
#endif /* !__GNUC__ */
-#if 0 /* unused */
static int
fxt1_bestcol (float vec[][MAX_COMP], int nv,
@@ -368,7 +367,6 @@ fxt1_worst (float vec[MAX_COMP],
return worst;
}
-#endif /* unused */
static int
fxt1_variance (double variance[MAX_COMP],
@@ -399,7 +397,6 @@ fxt1_variance (double variance[MAX_COMP],
return best;
}
-#if 0 /* unused */
static int
fxt1_choose (float vec[][MAX_COMP], int nv,
@@ -688,7 +685,6 @@ fxt1_quantize_ALPHA0 (unsigned long *cc,
cc[0] = lolo;
}
-#endif /* unused */
static void
fxt1_quantize_ALPHA1 (unsigned long *cc,
@@ -879,7 +875,6 @@ fxt1_quantize_ALPHA1 (unsigned long *cc,
((Fx64 *)cc)[1] = hi;
}
-#if 0 /* unused*/
static void
fxt1_quantize_HI (unsigned long *cc,
@@ -978,7 +973,6 @@ fxt1_quantize_HI (unsigned long *cc,
}
}
-#endif /* unused */
static void
fxt1_quantize_MIXED1 (unsigned long *cc,
@@ -1400,7 +1394,7 @@ fxt1_quantize (unsigned long *cc, const unsigned char *lines[], int comps)
}
}
- /* block looks like this:
+ /* block layout:
* 00, 01, 02, 03, 08, 09, 0a, 0b
* 10, 11, 12, 13, 18, 19, 1a, 1b
* 04, 05, 06, 07, 0c, 0d, 0e, 0f
@@ -1440,6 +1434,9 @@ fxt1_quantize (unsigned long *cc, const unsigned char *lines[], int comps)
} else {
fxt1_quantize_CHROMA(cc, input);
}
+ (void)fxt1_quantize_ALPHA1;
+ (void)fxt1_quantize_MIXED1;
+ (void)fxt1_quantize_MIXED0;
#else
if (trualpha) {
fxt1_quantize_ALPHA1(cc, input);
@@ -1451,6 +1448,9 @@ fxt1_quantize (unsigned long *cc, const unsigned char *lines[], int comps)
} else {
fxt1_quantize_MIXED0(cc, input);
}
+ (void)fxt1_quantize_ALPHA0;
+ (void)fxt1_quantize_HI;
+ (void)fxt1_quantize_CHROMA;
#endif
}