summaryrefslogtreecommitdiff
path: root/xc/extras/Mesa/src/interp_tmp.h
diff options
context:
space:
mode:
Diffstat (limited to 'xc/extras/Mesa/src/interp_tmp.h')
-rw-r--r--xc/extras/Mesa/src/interp_tmp.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/xc/extras/Mesa/src/interp_tmp.h b/xc/extras/Mesa/src/interp_tmp.h
index 2133629bc..0c9b4c287 100644
--- a/xc/extras/Mesa/src/interp_tmp.h
+++ b/xc/extras/Mesa/src/interp_tmp.h
@@ -1,4 +1,4 @@
-
+/* $XFree86: xc/extras/Mesa/src/interp_tmp.h,v 1.5 2001/04/01 13:59:57 tsi Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.1
@@ -23,6 +23,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#undef INTERP_UBYTE
#define INTERP_UBYTE( out, t, a, b ) { \
GLfloat fa = UBYTE_COLOR_TO_FLOAT_COLOR(a); \
GLfloat fb = UBYTE_COLOR_TO_FLOAT_COLOR(b); \
@@ -32,6 +33,7 @@
#if 1
+#undef INTERP_RGBA
#define INTERP_RGBA(nr, t, out, a, b) { \
int i; \
for (i = 0; i < nr; i++) { \
@@ -43,6 +45,7 @@
}
#else
+#undef INTERP_RGBA
#define INTERP_RGBA(nr, t, out, a, b) { \
int n; \
const GLuint ti = FloatToInt(t*256.0F); \