summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2011-04-14 14:56:19 -0700
committerKenneth Graunke <kenneth@whitecape.org>2011-05-17 23:33:00 -0700
commitfa4b23581b4ee8a07400364dccbd61b749c2d1d1 (patch)
tree1967bc294fa17f6e4288a61b5feffdd670b134e5 /src
parentd58400eb4a2605640267436f63d9e856fb3c1f96 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.c2
-rw-r--r--src/mesa/drivers/dri/i965/brw_gs.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index cd72bc5c242..a7b7c6f086b 100644
--- 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 aaffe94e981..001cd62f8ca 100644
--- 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 ||