eotwip/sched-eotsched-eot

1 files changed, 18 insertions, 0 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
index 8afdc25c2c59..cc42a3346bac 100644
--- a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
+++ b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
@@ -1657,10 +1657,28 @@ fs_visitor::schedule_instructions(instruction_scheduler_mode mode)
    else
       grf_count = alloc.count;
 
+   bblock_t *block = cfg->blocks[cfg->num_blocks - 1];
+   fs_inst *fb_write = (fs_inst *)block->end();
+   bool last_was_fb_write = false;
+   if (fb_write->opcode == FS_OPCODE_FB_WRITE) {
+      last_was_fb_write = true;
+
+      assert(fb_write->eot);
+      fb_write->eot = false;
+   }
+
    fs_instruction_scheduler sched(this, grf_count, first_non_payload_grf,
                                   cfg->num_blocks, mode);
    sched.run(cfg);
 
+   fb_write = (fs_inst *)block->end();
+   if (last_was_fb_write) {
+      assert(fb_write->opcode == FS_OPCODE_FB_WRITE);
+      fb_write->eot = true;
+   } else {
+      assert(fb_write->opcode != FS_OPCODE_FB_WRITE);
+   }
+
    invalidate_live_intervals();
 }