Mesa (10.2): Revert "i965: Don' t make instructions with a null dest a barrier to scheduling."

[Ian Romanick]

Module: Mesa
Branch: 10.2
Commit: c984e5bd2e75967817b01dd322bdfeccdd59534c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c984e5bd2e75967817b01dd322bdfeccdd59534c

Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon May 26 11:45:48 2014 -0700

Revert "i965: Don't make instructions with a null dest a barrier to scheduling."

This reverts commit 42a26cb5e441a01d5288b299980f23affaad53fe.

Cc: "10.2" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78648
(cherry picked from commit 0d3f83f4ad5f66a3ad62f1ec0cdc5029487e92f3)

---

 src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp |   12 ++++--------
 1 file 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 8cc6908..5e4f2fe 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);
       }