Mesa (master): nir/lower_phis_to_scalar: Fix some logic in is_phi_scalarizable

Jason Ekstrand jekstrand at kemper.freedesktop.org
Sat Feb 14 22:07:50 UTC 2015


Module: Mesa
Branch: master
Commit: 929f43851e669742081a17f85025efcb91189fbe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=929f43851e669742081a17f85025efcb91189fbe

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Mon Feb  9 14:22:14 2015 -0800

nir/lower_phis_to_scalar: Fix some logic in is_phi_scalarizable

Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/glsl/nir/nir_lower_phis_to_scalar.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/glsl/nir/nir_lower_phis_to_scalar.c b/src/glsl/nir/nir_lower_phis_to_scalar.c
index 3bb5cc7..7cd93ea 100644
--- a/src/glsl/nir/nir_lower_phis_to_scalar.c
+++ b/src/glsl/nir/nir_lower_phis_to_scalar.c
@@ -65,9 +65,9 @@ is_phi_src_scalarizable(nir_phi_src *src,
        * are ok too.
        */
       return nir_op_infos[src_alu->op].output_size == 0 ||
-             src_alu->op != nir_op_vec2 ||
-             src_alu->op != nir_op_vec3 ||
-             src_alu->op != nir_op_vec4;
+             src_alu->op == nir_op_vec2 ||
+             src_alu->op == nir_op_vec3 ||
+             src_alu->op == nir_op_vec4;
    }
 
    case nir_instr_type_phi:




More information about the mesa-commit mailing list