From d0b40e2c87be9378678da61742db927e842d93e6 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 22 Aug 2017 14:56:36 -0700 Subject: [PATCH] i965: Drop Gen7+ nonsense from brw_ff_gs.c. brw_ff_gs.c is about using the geometry shader to implement things that the fixed function ought to do, but doesn't on old hardware. Gen7+ does not need this. We should drop the misleading comment about Gen7 not using geometry shaders. Reviewed-by: Timothy Arceri --- src/mesa/drivers/dri/i965/brw_ff_gs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs.c b/src/mesa/drivers/dri/i965/brw_ff_gs.c index b7b4b716011..a3919524df1 100644 --- a/src/mesa/drivers/dri/i965/brw_ff_gs.c +++ b/src/mesa/drivers/dri/i965/brw_ff_gs.c @@ -170,6 +170,8 @@ brw_ff_gs_populate_key(struct brw_context *brw, struct gl_context *ctx = &brw->ctx; + assert(brw->gen < 7); + memset(key, 0, sizeof(*key)); /* BRW_NEW_VS_PROG_DATA (part of VUE map) */ @@ -187,10 +189,7 @@ brw_ff_gs_populate_key(struct brw_context *brw, key->pv_first = true; } - if (brw->gen >= 7) { - /* On Gen7 and later, we don't use GS (yet). */ - key->need_gs_prog = false; - } else if (brw->gen == 6) { + if (brw->gen == 6) { /* On Gen6, GS is used for transform feedback. */ /* BRW_NEW_TRANSFORM_FEEDBACK */ if (_mesa_is_xfb_active_and_unpaused(ctx)) { -- 2.30.2