diff options
| author | Matt Turner <mattst88@gmail.com> | 2014-05-26 11:45:48 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-05-29 15:44:09 -0700 |
| commit | c984e5bd2e75967817b01dd322bdfeccdd59534c (patch) | |
| tree | 61a56e3965b247a8b78c4d356554e7a51083895b | |
| parent | ca6b38b80a2ae40eaad579738f6a9495c287421d (diff) | |
Revert "i965: Don't make instructions with a null dest a barrier to scheduling."
This reverts commit 42a26cb5e441a01d5288b299980f23affaad53fe.
Cc: "10.2" <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78648
(cherry picked from commit 0d3f83f4ad5f66a3ad62f1ec0cdc5029487e92f3)
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp index 8cc69088fe6..5e4f2fe7478 100644 --- a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp +++ b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp @@ -870,8 +870,7 @@ fs_instruction_scheduler::calculate_deps() } else if (inst->dst.is_accumulator() && gen6plus) { 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); } @@ -998,8 +997,7 @@ fs_instruction_scheduler::calculate_deps() } } else if (inst->dst.is_accumulator() && gen6plus) { 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); } @@ -1115,8 +1113,7 @@ vec4_instruction_scheduler::calculate_deps() } else if (inst->dst.is_accumulator() && gen6plus) { 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); } @@ -1208,8 +1205,7 @@ vec4_instruction_scheduler::calculate_deps() last_fixed_grf_write = n; } else if (inst->dst.is_accumulator() && gen6plus) { 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); } |