[PATCH v2 7/7] vkd3d-shader/hlsl: Use LOGIC_AND instead of MUL in all().

[Francisco Casas]

From: Francisco Casas

---
 libs/vkd3d-shader/hlsl.y | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 35b55fcf8..fab585f96 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -2732,30 +2732,30 @@ static struct hlsl_type *convert_numeric_type(const struct hlsl_ctx *ctx,
 static bool intrinsic_all(struct hlsl_ctx *ctx,
         const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
 {
-    struct hlsl_ir_node *arg = params->args[0], *mul, *one, *zero, *load;
+    struct hlsl_ir_node *arg = params->args[0], *and, *load, *cast;
+    struct hlsl_type *bool_type;
     unsigned int i, count;

-    if (!(one = hlsl_new_float_constant(ctx, 1.0f, loc)))
-        return false;
-    hlsl_block_add_instr(params->instrs, one);
+    count = hlsl_type_component_count(arg->data_type);
+    bool_type = convert_numeric_type(ctx, arg->data_type, HLSL_TYPE_BOOL);

-    if (!(zero = hlsl_new_float_constant(ctx, 0.0f, loc)))
+    if (!(cast = add_cast(ctx, params->instrs, arg, bool_type, loc)))
         return false;
-    hlsl_block_add_instr(params->instrs, zero);

-    mul = one;
+    if (!(and = hlsl_add_load_component(ctx, params->instrs, cast, 0, loc)))
+        return false;

-    count = hlsl_type_component_count(arg->data_type);
-    for (i = 0; i < count; ++i)
+    for (i = 1; i < count; ++i)
     {
-        if (!(load = hlsl_add_load_component(ctx, params->instrs, arg, i, loc)))
+        if (!(load = hlsl_add_load_component(ctx, params->instrs, cast, i, loc)))
             return false;

-        if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, load, mul, loc)))
-            return false;
+        if (!(and = hlsl_new_binary_expr(ctx, HLSL_OP2_LOGIC_AND, and, load)))
+                return NULL;
+        hlsl_block_add_instr(params->instrs, and);
     }

-    return !!add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_NEQUAL, mul, zero, loc);
+    return true;
 }

static bool intrinsic_any(struct hlsl_ctx *ctx, const struct parse_initializer *params,