diff options
| author | Adam Jackson <ajax@freedesktop.org> | 2004-11-12 04:13:27 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@freedesktop.org> | 2004-11-12 04:13:27 +0000 |
| commit | 4d17d00bfc8ad5cb331e2fca235df60d84310b32 (patch) | |
| tree | 7ad76d5a27d4c4355fcf03d573978ab0559d7ce1 | |
| parent | b271ce8eda2fe3c349f03d7c7774f58672cf2cc4 (diff) | |
make render_quads_verts call EMIT_PRIM with the arguments in the right order,
and enable hardware quads on r200 and radeon. samples/prim renders quads
correctly now.
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_tcl.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_tcl.c | 2 | ||||
| -rw-r--r-- | src/mesa/tnl_dd/t_dd_dmatmp2.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c b/src/mesa/drivers/dri/r200/r200_tcl.c index d2dfc5fda1..122bcb9b78 100644 --- a/src/mesa/drivers/dri/r200/r200_tcl.c +++ b/src/mesa/drivers/dri/r200/r200_tcl.c @@ -62,7 +62,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define HAVE_TRI_STRIPS 1 #define HAVE_TRI_STRIP_1 0 #define HAVE_TRI_FANS 1 -#define HAVE_QUADS 0 /* hw quad verts in wrong order??? */ +#define HAVE_QUADS 1 #define HAVE_QUAD_STRIPS 1 #define HAVE_POLYGONS 1 #define HAVE_ELTS 1 diff --git a/src/mesa/drivers/dri/radeon/radeon_tcl.c b/src/mesa/drivers/dri/radeon/radeon_tcl.c index 6c121974eb..ae5b7ed3f2 100644 --- a/src/mesa/drivers/dri/radeon/radeon_tcl.c +++ b/src/mesa/drivers/dri/radeon/radeon_tcl.c @@ -66,7 +66,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define HAVE_TRI_STRIPS 1 #define HAVE_TRI_STRIP_1 0 #define HAVE_TRI_FANS 1 -#define HAVE_QUADS 0 +#define HAVE_QUADS 1 #define HAVE_QUAD_STRIPS 0 #define HAVE_POLYGONS 1 #define HAVE_ELTS 1 diff --git a/src/mesa/tnl_dd/t_dd_dmatmp2.h b/src/mesa/tnl_dd/t_dd_dmatmp2.h index b6eb71c567..b762221b1a 100644 --- a/src/mesa/tnl_dd/t_dd_dmatmp2.h +++ b/src/mesa/tnl_dd/t_dd_dmatmp2.h @@ -470,7 +470,7 @@ static void TAG(render_quads_verts)( GLcontext *ctx, return; if (HAVE_QUADS) { - EMIT_PRIM( ctx, HW_QUADS, GL_QUADS, start, count ); + EMIT_PRIM( ctx, GL_QUADS, HW_QUADS, start, count ); } else { /* Hardware doesn't have a quad primitive type -- simulate it |