[PATCH 2/6] vkd3d-shader/hlsl: Cast slt before multiplying on ternary operator.

[Francisco Casas]

From: Francisco Casas

Otherwise we may get a failing
    "hlsl_types_are_equal(arg1->data_type, arg2->data_type)"
assertion on hlsl_new_binary_expr() when creating the MUL.

This happens in the test introducing in the following patch:

int a, b, c;

void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos : sv_position)
    {
        out_pos = pos;

res = a ? b/1000.0 : c/1000.0;
    }
---
 libs/vkd3d-shader/hlsl.c         | 2 ++
 libs/vkd3d-shader/hlsl_codegen.c | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 45d02ce2b..4fd43d776 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -1344,6 +1344,8 @@ struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_exp
 {
     struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = {arg1, arg2};

+    FIXME("op %u\n", op);
+
     assert(hlsl_types_are_equal(arg1->data_type, arg2->data_type));
     return hlsl_new_expr(ctx, op, operands, arg1->data_type, &arg1->loc);
 }
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 8434a921a..9eb65dc01 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -2948,7 +2948,7 @@ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, stru
     }
     else if (ctx->profile->major_version < 4 && ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX)
     {
-        struct hlsl_ir_node *neg, *slt, *sum, *mul, *cond2;
+        struct hlsl_ir_node *neg, *slt, *sum, *cond2, *slt_cast, *mul;

/* Expression used here is "slt(<cond>) * (first - second) + second". */

@@ -2980,7 +2980,11 @@ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, stru
             return false;
         hlsl_block_add_instr(block, sum);

-        if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, slt, sum)))
+        if (!(slt_cast = hlsl_new_cast(ctx, slt, sum->data_type, &instr->loc)))
+            return false;
+        hlsl_block_add_instr(block, slt_cast);
+
+        if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, slt_cast, sum)))
             return false;
         hlsl_block_add_instr(block, mul);