[PATCH vkd3d 6/8] vkd3d-shader/hlsl: Support casts for all numeric types in fold_constants().

[Francisco Casas]

Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
---
 Makefile.am                           |   1 -
 libs/vkd3d-shader/hlsl_constant_ops.c | 131 +++++++++++++++++---------
 2 files changed, 87 insertions(+), 45 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d3dfc0a7..606bfdb4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,6 @@ vkd3d_shader_tests = \
 	tests/hlsl-vector-indexing.shader_test \
 	tests/hlsl-vector-indexing-uniform.shader_test \
 	tests/math.shader_test \
-	tests/max.shader_test \
 	tests/pow.shader_test \
 	tests/preproc-if.shader_test \
 	tests/preproc-ifdef.shader_test \
diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index 8279c58b..54c63691 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -20,6 +20,89 @@
 
 #include "hlsl.h"
 
+static int constant_op1_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt,
+        struct hlsl_ir_constant *src)
+{
+    uint32_t u;
+    int32_t i;
+    double d;
+    float f;
+
+    if (tgt->node.data_type->dimx != src->node.data_type->dimx ||
+            tgt->node.data_type->dimy != src->node.data_type->dimy)
+    {
+        FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type),
+                debug_hlsl_type(ctx, tgt->node.data_type));
+        return 0;
+    }
+
+    for (int k = 0; k < 4; k++)
+    {
+        switch (src->node.data_type->base_type)
+        {
+            case HLSL_TYPE_FLOAT:
+            case HLSL_TYPE_HALF:
+                u = src->value[k].f;
+                i = src->value[k].f;
+                f = src->value[k].f;
+                d = src->value[k].f;
+                break;
+            case HLSL_TYPE_DOUBLE:
+                u = src->value[k].d;
+                i = src->value[k].d;
+                f = src->value[k].d;
+                d = src->value[k].d;
+                break;
+            case HLSL_TYPE_INT:
+                u = src->value[k].i;
+                i = src->value[k].i;
+                f = src->value[k].i;
+                d = src->value[k].i;
+                break;
+            case HLSL_TYPE_UINT:
+                u = src->value[k].u;
+                i = src->value[k].u;
+                f = src->value[k].u;
+                d = src->value[k].u;
+                break;
+            case HLSL_TYPE_BOOL:
+                u = !!src->value[k].u;
+                i = !!src->value[k].u;
+                f = !!src->value[k].u;
+                d = !!src->value[k].u;
+                break;
+            default:
+                FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type),
+                        debug_hlsl_type(ctx, tgt->node.data_type));
+                return 0;
+        }
+        switch (tgt->node.data_type->base_type)
+        {
+            case HLSL_TYPE_FLOAT:
+            case HLSL_TYPE_HALF:
+                tgt->value[k].f = f;
+                break;
+            case HLSL_TYPE_DOUBLE:
+                tgt->value[k].d = d;
+                break;
+            case HLSL_TYPE_INT:
+                tgt->value[k].i = i;
+                break;
+            case HLSL_TYPE_UINT:
+                tgt->value[k].u = u;
+                break;
+            case HLSL_TYPE_BOOL:
+                tgt->value[k].u = (!!u) * 0xffffffff;
+                break;
+            default:
+                FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type),
+                        debug_hlsl_type(ctx, tgt->node.data_type));
+                return 0;
+        }
+    }
+    return 1;
+}
+
 static int constant_op2_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt,
         struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2)
 {
@@ -61,7 +144,7 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont
 {
     struct hlsl_ir_constant *arg1, *arg2 = NULL, *res;
     struct hlsl_ir_expr *expr;
-    unsigned int i, dimx;
+    unsigned int i;
     bool success;
 
     if (instr->type != HLSL_IR_EXPR)
@@ -76,7 +159,6 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont
     arg1 = hlsl_ir_constant(expr->operands[0].node);
     if (expr->operands[1].node)
         arg2 = hlsl_ir_constant(expr->operands[1].node);
-    dimx = instr->data_type->dimx;
 
     if (!(res = hlsl_alloc(ctx, sizeof(*res))))
         return false;
@@ -86,6 +168,9 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont
 
     switch (expr->op)
     {
+        case HLSL_OP1_CAST:
+            success = constant_op1_cast(ctx, res, arg1);
+            break;
         case HLSL_OP2_ADD:
             success = constant_op2_add(ctx, res, arg1, arg2);
             break;
@@ -109,48 +194,6 @@ fallback:
 
     switch (instr->data_type->base_type)
     {
-        case HLSL_TYPE_FLOAT:
-        {
-            switch (expr->op)
-            {
-                case HLSL_OP1_CAST:
-                    if (instr->data_type->dimx != arg1->node.data_type->dimx
-                            || instr->data_type->dimy != arg1->node.data_type->dimy)
-                    {
-                        FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type),
-                                debug_hlsl_type(ctx, instr->data_type));
-                        vkd3d_free(res);
-                        return false;
-                    }
-
-                    switch (arg1->node.data_type->base_type)
-                    {
-                        case HLSL_TYPE_INT:
-                            for (i = 0; i < dimx; ++i)
-                                res->value[i].f = arg1->value[i].i;
-                            break;
-
-                        case HLSL_TYPE_UINT:
-                            for (i = 0; i < dimx; ++i)
-                                res->value[i].f = arg1->value[i].u;
-                            break;
-
-                        default:
-                            FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type),
-                                    debug_hlsl_type(ctx, instr->data_type));
-                            vkd3d_free(res);
-                            return false;
-                    }
-                    break;
-
-                default:
-                    FIXME("Fold float op %#x.\n", expr->op);
-                    vkd3d_free(res);
-                    return false;
-            }
-            break;
-        }
-
         case HLSL_TYPE_UINT:
         {
             switch (expr->op)
-- 
2.25.1