From: Francisco Jerez <currojerez@riseup.net>
Date: Wed, 4 May 2016 01:36:02 +0000 (-0700)
Subject: i965/fs: Take opt_redundant_discard_jumps out of the optimization loop.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2a166c13d4a6edecaffc56a8220dda146e3ce8a0;p=mesa.git

i965/fs: Take opt_redundant_discard_jumps out of the optimization loop.

No shader-db regressions.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 6340d3a1a39..5b75a79957e 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -5700,7 +5700,6 @@ fs_visitor::optimize()
       OPT(opt_peephole_sel);
       OPT(dead_control_flow_eliminate, this);
       OPT(opt_register_renaming);
-      OPT(opt_redundant_discard_jumps);
       OPT(opt_saturate_propagation);
       OPT(register_coalesce);
       OPT(compute_to_mrf);
@@ -5733,9 +5732,9 @@ fs_visitor::optimize()
       OPT(dead_code_eliminate);
       OPT(remove_duplicate_mrf_writes);
       OPT(opt_peephole_sel);
-      OPT(opt_redundant_discard_jumps);
    }
 
+   OPT(opt_redundant_discard_jumps);
    OPT(opt_sampler_eot);
 
    if (OPT(lower_load_payload)) {