Metal: Vector compare will now translate correctly.

src/glsl/ir_print_metal_visitor.cpp

@@ -1027,6 +1027,18 @@ void ir_print_metal_visitor::visit(ir_expression *ir)
 	}
 	else if (ir->get_num_operands() == 2)
 	{
+		if (ir->operands[0] && ir->operands[1] && ir->operands[0]->type->is_vector() && ir->operands[1]->type->is_vector())
+		{
+			if (ir->operation == ir_binop_all_equal)
+			{
+				buffer.asprintf_append ("all");
+			}
+			else if (ir->operation == ir_binop_any_nequal)
+			{
+				buffer.asprintf_append ("any");
+			}
+		}
+
 		buffer.asprintf_append ("(");
 		if (ir->operands[0])
 		{

tests/vertex/bug-vector-compare-inES3.txt

@@ -0,0 +1,28 @@
+#version 300 es
+
+// Metal translation was not producing required any/all
+// for comparing vector operands using == or != (which
+// GLSL does implicitly according to spec).
+
+uniform highp float u_x;
+uniform highp float u_y;
+uniform highp vec4 u_u4;
+uniform highp vec4 u_v4;
+
+out highp vec3 xlv_out;
+
+void main()
+{
+  if ((u_x == u_y) || (u_u4 == u_v4))
+  {
+    xlv_out = vec3(0.0);
+  }
+  else if ((u_x != u_y) || (u_u4 != u_v4))
+  {
+    xlv_out = vec3(1.0);
+  }
+    else
+  {
+    xlv_out = vec3(2.0);
+  }
+}

tests/vertex/bug-vector-compare-outES3.txt

@@ -0,0 +1,26 @@
+#version 300 es
+uniform highp float u_x;
+uniform highp float u_y;
+uniform highp vec4 u_u4;
+uniform highp vec4 u_v4;
+out highp vec3 xlv_out;
+void main ()
+{
+  if (((u_x == u_y) || (u_u4 == u_v4))) {
+    xlv_out = vec3(0.0, 0.0, 0.0);
+  } else {
+    if (((u_x != u_y) || (u_u4 != u_v4))) {
+      xlv_out = vec3(1.0, 1.0, 1.0);
+    } else {
+      xlv_out = vec3(2.0, 2.0, 2.0);
+    };
+  };
+}
+
+
+// stats: 9 alu 0 tex 2 flow
+// uniforms: 4 (total size: 0)
+//  #0: u_x (high float) 1x1 [-1]
+//  #1: u_y (high float) 1x1 [-1]
+//  #2: u_u4 (high float) 4x1 [-1]
+//  #3: u_v4 (high float) 4x1 [-1]

tests/vertex/bug-vector-compare-outES3Metal.txt

@@ -0,0 +1,35 @@
+#include <metal_stdlib>
+using namespace metal;
+struct xlatMtlShaderInput {
+};
+struct xlatMtlShaderOutput {
+  float3 xlv_out;
+};
+struct xlatMtlShaderUniform {
+  float u_x;
+  float u_y;
+  float4 u_u4;
+  float4 u_v4;
+};
+vertex xlatMtlShaderOutput xlatMtlMain (xlatMtlShaderInput _mtl_i [[stage_in]], constant xlatMtlShaderUniform& _mtl_u [[buffer(0)]])
+{
+  xlatMtlShaderOutput _mtl_o;
+  if (((_mtl_u.u_x == _mtl_u.u_y) || all(_mtl_u.u_u4 == _mtl_u.u_v4))) {
+    _mtl_o.xlv_out = float3(0.0, 0.0, 0.0);
+  } else {
+    if (((_mtl_u.u_x != _mtl_u.u_y) || any(_mtl_u.u_u4 != _mtl_u.u_v4))) {
+      _mtl_o.xlv_out = float3(1.0, 1.0, 1.0);
+    } else {
+      _mtl_o.xlv_out = float3(2.0, 2.0, 2.0);
+    };
+  };
+  return _mtl_o;
+}
+
+
+// stats: 9 alu 0 tex 2 flow
+// uniforms: 4 (total size: 48)
+//  #0: u_x (high float) 1x1 [-1] loc 0
+//  #1: u_y (high float) 1x1 [-1] loc 4
+//  #2: u_u4 (high float) 4x1 [-1] loc 16
+//  #3: u_v4 (high float) 4x1 [-1] loc 32