Mesa (master): r300g: EXT_provoking_vertex.

[Corbin Simpson]

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

Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date:   Fri Jun 26 21:48:09 2009 -0700

r300g: EXT_provoking_vertex.

---

 src/gallium/drivers/r300/r300_reg.h   |    6 ++----
 src/gallium/drivers/r300/r300_state.c |    4 ++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_reg.h b/src/gallium/drivers/r300/r300_reg.h
index 229afc6..e57535f 100644
--- a/src/gallium/drivers/r300/r300_reg.h
+++ b/src/gallium/drivers/r300/r300_reg.h
@@ -1064,8 +1064,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
         R300_GA_COLOR_CONTROL_RGB2_SHADING_FLAT | \
         R300_GA_COLOR_CONTROL_ALPHA2_SHADING_FLAT | \
         R300_GA_COLOR_CONTROL_RGB3_SHADING_FLAT | \
-        R300_GA_COLOR_CONTROL_ALPHA3_SHADING_FLAT | \
-        R300_GA_COLOR_CONTROL_PROVOKING_VERTEX_LAST )
+        R300_GA_COLOR_CONTROL_ALPHA3_SHADING_FLAT )
 
 #       define R300_SHADE_MODEL_SMOOTH ( \
         R300_GA_COLOR_CONTROL_RGB0_SHADING_GOURAUD | \
@@ -1075,8 +1074,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
         R300_GA_COLOR_CONTROL_RGB2_SHADING_GOURAUD | \
         R300_GA_COLOR_CONTROL_ALPHA2_SHADING_GOURAUD | \
         R300_GA_COLOR_CONTROL_RGB3_SHADING_GOURAUD | \
-        R300_GA_COLOR_CONTROL_ALPHA3_SHADING_GOURAUD | \
-        R300_GA_COLOR_CONTROL_PROVOKING_VERTEX_LAST )
+        R300_GA_COLOR_CONTROL_ALPHA3_SHADING_GOURAUD )
 
 /* Specifies red & green components of fill color -- S312 format -- Backwards comp. */
 #define R300_GA_SOLID_RG                         0x427c
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index d70ef6b..163b14e 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -421,6 +421,10 @@ static void* r300_create_rs_state(struct pipe_context* pipe,
         rs->color_control = R300_SHADE_MODEL_SMOOTH;
     }
 
+    if (!state->flatshade_first) {
+        rs->color_control |= R300_GA_COLOR_CONTROL_PROVOKING_VERTEX_LAST;
+    }
+
     return (void*)rs;
 }