summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-12-12 00:31:45 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-12-12 00:31:45 +0000
commit75639547e70f45b7782cf528b118a39b82b06ba3 (patch)
tree04e9699137e08fc5bf5dafb7af705f6b2af434ac /src/mesa
parentb38ad54c41aec2d08fdd26a4a8ea4dcdca8b1dfd (diff)
disabled two optimized textured triangle functions because of texcoord interpolation errors
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_triangle.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index a88454c087b..6c232cb694c 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -1,4 +1,4 @@
-/* $Id: s_triangle.c,v 1.6 2000/11/21 23:09:18 brianp Exp $ */
+/* $Id: s_triangle.c,v 1.7 2000/12/12 00:31:45 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -679,6 +679,7 @@ static void affine_textured_triangle( GLcontext *ctx,
* This function written by Klaus Niederkrueger <klaus@math.leidenuniv.nl>
* Send all questions and bug reports to him.
*/
+#if 0 /* XXX disabled because of texcoord interpolation errors */
static void near_persp_textured_triangle(GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
@@ -1408,7 +1409,7 @@ static void near_persp_textured_triangle(GLcontext *ctx,
#undef DRAW_LINE
#undef BIAS
}
-
+#endif
/*
@@ -1419,6 +1420,7 @@ static void near_persp_textured_triangle(GLcontext *ctx,
* This function written by Klaus Niederkrueger <klaus@math.leidenuniv.nl>
* Send all questions and bug reports to him.
*/
+#if 0 /* XXX disabled because of texcoord interpolation errors */
static void lin_persp_textured_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
@@ -1585,11 +1587,10 @@ static void lin_persp_textured_triangle( GLcontext *ctx,
} \
}
-
#include "s_tritemp.h"
#undef SPAN
}
-
+#endif
/*
@@ -2342,6 +2343,7 @@ _swrast_choose_triangle( GLcontext *ctx )
}
}
else {
+#if 00 /* XXX these function have problems with texture coord interpolation */
if (filter==GL_NEAREST) {
swrast->Triangle = near_persp_textured_triangle;
dputs("near_persp_textured_triangle");
@@ -2350,6 +2352,8 @@ _swrast_choose_triangle( GLcontext *ctx )
swrast->Triangle = lin_persp_textured_triangle;
dputs("lin_persp_textured_triangle");
}
+#endif
+ swrast->Triangle = general_textured_triangle;
}
}
else {