From 4d17d00bfc8ad5cb331e2fca235df60d84310b32 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 12 Nov 2004 04:13:27 +0000 Subject: [PATCH] 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. --- src/mesa/drivers/dri/r200/r200_tcl.c | 2 +- src/mesa/drivers/dri/radeon/radeon_tcl.c | 2 +- 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 d2dfc5fda17..122bcb9b787 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 6c121974eba..ae5b7ed3f28 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 b6eb71c5674..b762221b1a8 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 -- 2.30.2