summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2015-02-13 10:34:39 -0800
committerMatt Turner <[email protected]>2015-02-15 12:24:11 -0800
commitfa124a337ca10d2c5d2d81a89dc8c21a7ba2f58b (patch)
treee7f2fa5b2e2f84af6d147be0cdd5fb98af211b93 /src
parenteb47d0efd39d73d4388389d6c0ebe458160f79fa (diff)
i965/fs: Call calculate_cfg() before optimize().
The CFG is fundamental to the FS IR, not merely a piece of optimization. Reviewed-by: Ben Widawsky <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 0f1300c1cc6..a311266201b 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -3557,8 +3557,6 @@ fs_visitor::optimize()
{
const char *stage_name = stage == MESA_SHADER_VERTEX ? "vs" : "fs";
- calculate_cfg();
-
split_virtual_grfs();
move_uniform_array_access_to_pull_constants();
@@ -3734,6 +3732,8 @@ fs_visitor::run_vs()
emit_urb_writes();
+ calculate_cfg();
+
optimize();
assign_curb_setup();
@@ -3813,6 +3813,8 @@ fs_visitor::run_fs()
emit_fb_writes();
+ calculate_cfg();
+
optimize();
assign_curb_setup();