summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2013-11-06 17:43:25 -0800
committerEric Anholt <eric@anholt.net>2013-11-12 15:06:21 -0800
commitfbd8303a943d0d491b7c2415eb237a0731c7dec5 (patch)
tree73eec9f58931dab6464f5319c6f823799216223d /src/mesa
parentf72a0d99fed5d6205431a59775484cde3442cceb (diff)
i965/fs: Do instruction pre-scheduling just before register allocation.
Long ago, the HW_REG usage in assign_curb/urb_setup() were scheduling barriers, so we had to run scheduler before them in order for it to be able to do basically anything. Now that that's fixed, we can delay the scheduling until we go to allocate (which will make the next change less scary). Cc: "10.0" <mesa-stable@lists.freedesktop.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index ee7b07d9b75..afa82c9abbf 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -3281,13 +3281,13 @@ fs_visitor::run()
progress = compute_to_mrf() || progress;
} while (progress);
- schedule_instructions(false);
-
lower_uniform_pull_constant_loads();
assign_curb_setup();
assign_urb_setup();
+ schedule_instructions(false);
+
if (0)
assign_regs_trivial();
else {