<div dir="ltr">Sorry I didn't get to this earlier. It got lost in the backlog.<br><br>Reviewed-by: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>><br><div><br>Out of curiosity, are there any shader-db results for this? If not, that's ok.<br><div><br></div><div>--Jason<br></div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Feb 4, 2015 at 3:19 PM, Matt Turner <span dir="ltr"><<a href="mailto:mattst88@gmail.com" target="_blank">mattst88@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">---<br>
I don't know if this is right, but what we had before was definitely<br>
wrong. (And gcc warned about it!)<br>
<br>
src/glsl/nir/nir_lower_phis_to_scalar.c | 6 +++---<br>
1 file changed, 3 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/src/glsl/nir/nir_lower_phis_to_scalar.c b/src/glsl/nir/nir_lower_phis_to_scalar.c<br>
index 3bb5cc7..7c2f539 100644<br>
--- a/src/glsl/nir/nir_lower_phis_to_scalar.c<br>
+++ b/src/glsl/nir/nir_lower_phis_to_scalar.c<br>
@@ -65,9 +65,9 @@ is_phi_src_scalarizable(nir_phi_src *src,<br>
* are ok too.<br>
*/<br>
return nir_op_infos[src_alu->op].output_size == 0 ||<br>
- src_alu->op != nir_op_vec2 ||<br>
- src_alu->op != nir_op_vec3 ||<br>
- src_alu->op != nir_op_vec4;<br>
+ (src_alu->op != nir_op_vec2 &&<br>
+ src_alu->op != nir_op_vec3 &&<br>
+ src_alu->op != nir_op_vec4);<br>
}<br>
<br>
case nir_instr_type_phi:<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.0.4<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div>