summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/tdfx
diff options
context:
space:
mode:
authorDaniel Borca <dborca@users.sourceforge.net>2004-12-17 10:40:32 +0000
committerDaniel Borca <dborca@users.sourceforge.net>2004-12-17 10:40:32 +0000
commitcf9516954295203b6d40887da6e73269b811a0a2 (patch)
tree2f06b31bbbde3963fba3cd93c4d44ea1527eaf45 /src/mesa/drivers/dri/tdfx
parent02978f109265f7a598a4a6a8d81d134d8308785e (diff)
fxRasterPrimitive wasn't always receiving the reduced primitive
Diffstat (limited to 'src/mesa/drivers/dri/tdfx')
-rw-r--r--src/mesa/drivers/dri/tdfx/tdfx_tris.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tris.c b/src/mesa/drivers/dri/tdfx/tdfx_tris.c
index 1f0e03c04b..e9d44c6562 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_tris.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_tris.c
@@ -53,6 +53,19 @@
static void tdfxRasterPrimitive( GLcontext *ctx, GLenum prim );
static void tdfxRenderPrimitive( GLcontext *ctx, GLenum prim );
+static GLenum reduced_prim[GL_POLYGON+1] = {
+ GL_POINTS,
+ GL_LINES,
+ GL_LINES,
+ GL_LINES,
+ GL_TRIANGLES,
+ GL_TRIANGLES,
+ GL_TRIANGLES,
+ GL_TRIANGLES,
+ GL_TRIANGLES,
+ GL_TRIANGLES
+};
+
/***********************************************************************
* Macros for t_dd_tritmp.h to draw basic primitives *
***********************************************************************/
@@ -364,8 +377,8 @@ do { \
* Functions to draw basic unfilled primitives *
***********************************************************************/
-#define RASTERIZE(x) if (fxMesa->raster_primitive != x) \
- tdfxRasterPrimitive( ctx, x )
+#define RASTERIZE(x) if (fxMesa->raster_primitive != reduced_prim[x]) \
+ tdfxRasterPrimitive( ctx, reduced_prim[x] )
#define RENDER_PRIMITIVE fxMesa->render_primitive
#define IND TDFX_FALLBACK_BIT
#define TAG(x) x
@@ -1135,20 +1148,6 @@ static void tdfxRenderStart( GLcontext *ctx )
}
-static GLenum reduced_prim[GL_POLYGON+1] = {
- GL_POINTS,
- GL_LINES,
- GL_LINES,
- GL_LINES,
- GL_TRIANGLES,
- GL_TRIANGLES,
- GL_TRIANGLES,
- GL_TRIANGLES,
- GL_TRIANGLES,
- GL_TRIANGLES
-};
-
-
/* Always called between RenderStart and RenderFinish --> We already
* hold the lock.