From a1c899c718758d68c112590d826e16c772ace195 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 30 Jun 2014 08:05:42 -0700 Subject: [PATCH] i965/eu: Set UIP on ELSE instructions on Broadwell. Broadwell adds UIP on ELSE instructions. Signed-off-by: Kenneth Graunke Reviewed-by: Chris Forbes Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_eu_emit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c index e102d4b1c4a..3ab44333ec8 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_emit.c +++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c @@ -1391,6 +1391,12 @@ patch_IF_ELSE(struct brw_compile *p, /* The IF instruction's UIP and ELSE's JIP should point to ENDIF */ brw_inst_set_uip(brw, if_inst, br * (endif_inst - if_inst)); brw_inst_set_jip(brw, else_inst, br * (endif_inst - else_inst)); + if (brw->gen >= 8) { + /* Since we don't set branch_ctrl, the ELSE's JIP and UIP both + * should point to ENDIF. + */ + brw_inst_set_uip(brw, else_inst, br * (endif_inst - else_inst)); + } } } } -- 2.30.2