summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/brw_eu_compact.c
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2014-09-24 10:01:23 -0700
committerMatt Turner <mattst88@gmail.com>2014-09-25 11:02:36 -0700
commitcde887ccb13c9b42759c08e5694bd8cf37b51170 (patch)
tree17734851cb8fbd76749150fbbd634f892a6611dd /src/mesa/drivers/dri/i965/brw_eu_compact.c
parent118021f929e9f8a378033b3c5711e087205a2877 (diff)
downloadexternal_mesa3d-cde887ccb13c9b42759c08e5694bd8cf37b51170.zip
external_mesa3d-cde887ccb13c9b42759c08e5694bd8cf37b51170.tar.gz
external_mesa3d-cde887ccb13c9b42759c08e5694bd8cf37b51170.tar.bz2
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 <kenneth@whitecape.org> Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_eu_compact.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_eu_compact.c5
1 files 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) {