i965: Don't use the GS for breaking down quads on Ivybridge.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index cd72bc5c242dffd541280f8e8a08650fa4f68216..a7b7c6f086bb2630b3c4ea8ccb7ac43f7c744bbb 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -161,7 +161,7 @@ GLboolean brwCreateContext( int api,
       but we're not sure how it's actually done for vertex order,
       that affect provoking vertex decision. Always use last vertex
       convention for quad primitive which works as expected for now. */
-   if (intel->gen == 6)
+   if (intel->gen >= 6)
        ctx->Const.QuadsFollowProvokingVertexConvention = GL_FALSE;
 
    if (intel->is_g4x || intel->gen >= 5) {

diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c
index aaffe94e981e66cfb6c3e6068655bf0a4a5c5d82..001cd62f8cac8a20f922409a8a1b4ef41d040bf0 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_gs.c
@@ -56,7 +56,7 @@ static void compile_gs_prog( struct brw_context *brw,
    /* Gen6: VF has already converted into polygon, and LINELOOP is
     * converted to LINESTRIP at the beginning of the 3D pipeline.
     */
-   if (intel->gen == 6)
+   if (intel->gen >= 6)
       return;
 
    memset(&c, 0, sizeof(c));
@@ -168,7 +168,7 @@ static void populate_key( struct brw_context *brw,
       key->pv_first = GL_TRUE;
    }
 
-   key->need_gs_prog = (intel->gen == 6)
+   key->need_gs_prog = (intel->gen >= 6)
       ? 0
       : (brw->primitive == GL_QUADS ||
         brw->primitive == GL_QUAD_STRIP ||