From cde887ccb13c9b42759c08e5694bd8cf37b51170 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 24 Sep 2014 10:01:23 -0700 Subject: [PATCH] i965/compaction: Remove unnecessary is-compacted? check. Used to pass over previously compacted instructions in this loop, but no longer. No point in checking. Reviewed-by: Kenneth Graunke Reviewed-by: Jason Ekstrand --- src/mesa/drivers/dri/i965/brw_eu_compact.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c index 5617947..6af134c 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_compact.c +++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c @@ -737,6 +737,8 @@ brw_try_compact_instruction(struct brw_context *brw, brw_compact_inst *dst, { brw_compact_inst temp; + assert(brw_inst_cmpt_control(brw, src) == 0); + if (brw_inst_opcode(brw, src) == BRW_OPCODE_IF || brw_inst_opcode(brw, src) == BRW_OPCODE_ELSE || brw_inst_opcode(brw, src) == BRW_OPCODE_ENDIF || @@ -1117,8 +1119,7 @@ brw_compact_instructions(struct brw_compile *p, int start_offset, brw_inst saved = *src; - if (!brw_inst_cmpt_control(brw, src) && - brw_try_compact_instruction(brw, dst, src)) { + if (brw_try_compact_instruction(brw, dst, src)) { compacted_count++; if (INTEL_DEBUG) { -- 2.7.4