From 0d3f83f4ad5f66a3ad62f1ec0cdc5029487e92f3 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 26 May 2014 11:45:48 -0700 Subject: Revert "i965: Don't make instructions with a null dest a barrier to scheduling." This reverts commit 42a26cb5e441a01d5288b299980f23affaad53fe. Cc: "10.2" Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78648 --- src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp') diff --git a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp index c9cd136..42fc5e4 100644 --- a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp +++ b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp @@ -866,8 +866,7 @@ fs_instruction_scheduler::calculate_deps() } else if (inst->dst.is_accumulator()) { add_dep(last_accumulator_write, n); last_accumulator_write = n; - } else if (inst->dst.file != BAD_FILE && - !inst->dst.is_null()) { + } else if (inst->dst.file != BAD_FILE) { add_barrier_deps(n); } @@ -989,8 +988,7 @@ fs_instruction_scheduler::calculate_deps() } } else if (inst->dst.is_accumulator()) { last_accumulator_write = n; - } else if (inst->dst.file != BAD_FILE && - !inst->dst.is_null()) { + } else if (inst->dst.file != BAD_FILE) { add_barrier_deps(n); } @@ -1098,8 +1096,7 @@ vec4_instruction_scheduler::calculate_deps() } else if (inst->dst.is_accumulator()) { add_dep(last_accumulator_write, n); last_accumulator_write = n; - } else if (inst->dst.file != BAD_FILE && - !inst->dst.is_null()) { + } else if (inst->dst.file != BAD_FILE) { add_barrier_deps(n); } @@ -1186,8 +1183,7 @@ vec4_instruction_scheduler::calculate_deps() last_fixed_grf_write = n; } else if (inst->dst.is_accumulator()) { last_accumulator_write = n; - } else if (inst->dst.file != BAD_FILE && - !inst->dst.is_null()) { + } else if (inst->dst.file != BAD_FILE) { add_barrier_deps(n); } -- cgit v1.1