diff options
| author | keithw <keithw@keithw-laptop.(none)> | 2007-09-26 11:57:28 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-09-27 07:56:23 +0100 |
| commit | e078f910dcdba2081a52b74308ca3d330115e912 (patch) | |
| tree | 54da47a8cfa0df95716856cc95db1c481bb8736f | |
| parent | 08589f71051e588b0bb7d0c8b529976c85398dd1 (diff) | |
restore primitive trimming in sp_draw_arrays.c
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_draw_arrays.c | 9 | ||||
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_prim_setup.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/pipe/softpipe/sp_draw_arrays.c b/src/mesa/pipe/softpipe/sp_draw_arrays.c index 21c30b53f3..405659fb46 100644 --- a/src/mesa/pipe/softpipe/sp_draw_arrays.c +++ b/src/mesa/pipe/softpipe/sp_draw_arrays.c @@ -99,12 +99,15 @@ softpipe_draw_elements(struct pipe_context *pipe, /* first, check that the primitive is not malformed. It is the * state tracker's responsibility to do send only correctly formed - * primitives down. + * primitives down. It currently isn't doing that though... */ -// count = draw_trim_prim( mode, count ); - +#if 1 + count = draw_trim_prim( mode, count ); +#else if (!draw_validate_prim( mode, count )) assert(0); +#endif + if (sp->dirty) softpipe_update_derived( sp ); diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.c b/src/mesa/pipe/softpipe/sp_prim_setup.c index 621a44512c..2e27d00acf 100644 --- a/src/mesa/pipe/softpipe/sp_prim_setup.c +++ b/src/mesa/pipe/softpipe/sp_prim_setup.c @@ -41,7 +41,7 @@ #include "pipe/draw/draw_vertex.h" #include "pipe/p_util.h" -#define DEBUG_VERTS 1 +#define DEBUG_VERTS 0 /** * Triangle edge info |