Mesa (master): Revert "softpipe: fix flat shading provoking vertex for PIPE_PRIM_POLYGON"

[Brian Paul]

Module: Mesa
Branch: master
Commit: 6c3cefdda6c98d5f0df874c7f1d8c5421cc8468b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c3cefdda6c98d5f0df874c7f1d8c5421cc8468b

Author: Brian Paul <brianp at vmware.com>
Date:   Sat May 30 20:09:19 2009 -0600

Revert "softpipe: fix flat shading provoking vertex for PIPE_PRIM_POLYGON"

This reverts commit 5d75124db480b37977c353511b4e228905b7cc95.

This fixed unclipped polygons, but broke clipped polygons.
A better fix from the mesa 7.5 branch will be merged next...

---

 src/gallium/drivers/softpipe/sp_context.h     |    1 -
 src/gallium/drivers/softpipe/sp_draw_arrays.c |    1 -
 src/gallium/drivers/softpipe/sp_setup.c       |    5 +----
 3 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/softpipe/sp_context.h b/src/gallium/drivers/softpipe/sp_context.h
index 2f90d53..b89a729 100644
--- a/src/gallium/drivers/softpipe/sp_context.h
+++ b/src/gallium/drivers/softpipe/sp_context.h
@@ -107,7 +107,6 @@ struct softpipe_context {
    /** Which vertex shader output slot contains point size */
    int psize_slot;
 
-   unsigned api_prim;  /**< current prim type being drawn: PIPE_PRIM_x */
    unsigned reduced_api_prim;  /**< PIPE_PRIM_POINTS, _LINES or _TRIANGLES */
 
    /** Derived from scissor and surface bounds: */
diff --git a/src/gallium/drivers/softpipe/sp_draw_arrays.c b/src/gallium/drivers/softpipe/sp_draw_arrays.c
index 1460bc4..f117096 100644
--- a/src/gallium/drivers/softpipe/sp_draw_arrays.c
+++ b/src/gallium/drivers/softpipe/sp_draw_arrays.c
@@ -129,7 +129,6 @@ softpipe_draw_range_elements(struct pipe_context *pipe,
    struct draw_context *draw = sp->draw;
    unsigned i;
 
-   sp->api_prim = mode;
    sp->reduced_api_prim = reduced_prim[mode];
 
    if (sp->dirty)
diff --git a/src/gallium/drivers/softpipe/sp_setup.c b/src/gallium/drivers/softpipe/sp_setup.c
index 4f0baa3..c6844a2 100644
--- a/src/gallium/drivers/softpipe/sp_setup.c
+++ b/src/gallium/drivers/softpipe/sp_setup.c
@@ -514,10 +514,7 @@ static boolean setup_sort_vertices( struct setup_context *setup,
                                     const float (*v1)[4],
                                     const float (*v2)[4] )
 {
-   if (setup->softpipe->api_prim == PIPE_PRIM_POLYGON)
-      setup->vprovoke = v0;
-   else
-      setup->vprovoke = v2;
+   setup->vprovoke = v2;
 
    /* determine bottom to top order of vertices */
    {