diff options
| author | Matt Turner <mattst88@gmail.com> | 2014-05-26 11:45:48 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2014-05-26 11:47:15 -0700 |
| commit | 0d3f83f4ad5f66a3ad62f1ec0cdc5029487e92f3 (patch) | |
| tree | daf757a0fdfe7be38c37386e048308a2b233b41d /src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp | |
| parent | a39428cf5c973513c5189dec4af34ce1e1582d51 (diff) | |
| download | external_mesa3d-0d3f83f4ad5f66a3ad62f1ec0cdc5029487e92f3.zip external_mesa3d-0d3f83f4ad5f66a3ad62f1ec0cdc5029487e92f3.tar.gz external_mesa3d-0d3f83f4ad5f66a3ad62f1ec0cdc5029487e92f3.tar.bz2 | |
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
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp')
| -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 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); } |