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 <ben@bwidawsk.net>

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 0f1300c1cc6961f94324b83e0276fd30fe9216ec..a311266201ba3086e5cf58c9446a5f491b2cdb50 100644 (file)
--- 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();