---
I don't know if this is right, but what we had before was definitely
wrong. (And gcc warned about it!)
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..7c2f539 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:
--
2.0.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
