diff options
| author | Roland Scheidegger <[email protected]> | 2004-11-23 18:49:18 +0000 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2004-11-23 18:49:18 +0000 |
| commit | ba6274126180368cf108b3afff2dbb0a0b34e8b5 (patch) | |
| tree | 040f378aa7ee847e32e23307a8c1ca2b7097e375 | |
| parent | 180b0db3440833b58303990b9095318f56c11b75 (diff) | |
revert enabling of hw quads for swtcl. It lead to problems with quad_strips, since they'll get reduced to quads sometimes if hw quads are enabled. But this needs more thought, since it looks like clipped primitives will always be emitted as polys, so the reduced primitives for triangles, quads, quads_strips, polys all need to be the same, otherwise get lockups with for instance the olympic test. Render templates would probably need to be changed for this to work.
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_swtcl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c index 5b74b47980c..43f83650781 100644 --- a/src/mesa/drivers/dri/r200/r200_swtcl.c +++ b/src/mesa/drivers/dri/r200/r200_swtcl.c @@ -334,7 +334,7 @@ static const GLuint reduced_hw_prim[GL_POLYGON+1] = { R200_VF_PRIM_TRIANGLES, R200_VF_PRIM_TRIANGLES, R200_VF_PRIM_TRIANGLES, - R200_VF_PRIM_QUADS, + R200_VF_PRIM_TRIANGLES, R200_VF_PRIM_TRIANGLES, R200_VF_PRIM_TRIANGLES }; @@ -354,7 +354,7 @@ static void r200ResetLineStipple( GLcontext *ctx ); #define HAVE_TRI_STRIPS 1 #define HAVE_TRI_STRIP_1 0 #define HAVE_TRI_FANS 1 -#define HAVE_QUADS 1 +#define HAVE_QUADS 0 #define HAVE_QUAD_STRIPS 0 #define HAVE_POLYGONS 1 #define HAVE_ELTS 0 |