summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2014-05-26 11:45:48 -0700
committerMatt Turner <[email protected]>2014-05-26 11:47:15 -0700
commit0d3f83f4ad5f66a3ad62f1ec0cdc5029487e92f3 (patch)
treedaf757a0fdfe7be38c37386e048308a2b233b41d
parenta39428cf5c973513c5189dec4af34ce1e1582d51 (diff)
Revert "i965: Don't make instructions with a null dest a barrier to scheduling."
This reverts commit 42a26cb5e441a01d5288b299980f23affaad53fe. Cc: "10.2" <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78648
-rw-r--r--src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp12
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 c9cd136cee8..42fc5e476b9 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);
}