restore primitive trimming in sp_draw_arrays.c

diff --git a/src/mesa/pipe/softpipe/sp_draw_arrays.c b/src/mesa/pipe/softpipe/sp_draw_arrays.c
index 21c30b53f3ab673b1e8ca76cc719e059031ce729..405659fb464255e27fa2ed89648db7ad7305e1c1 100644 (file)
--- 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 621a44512c4811e890461d01254693b07516d0b2..2e27d00acfb02c4fec960caa3fbe63a67e38fd09 100644 (file)
--- 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