Giovanni Mascellani : vkd3d-shader/hlsl: Fold constant integral max().

Alexandre Julliard julliard at winehq.org
Tue Jun 28 15:52:45 CDT 2022


Module: vkd3d
Branch: master
Commit: 8cb865d65ab75aaaf3149db5a8baefb3b521affb
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=8cb865d65ab75aaaf3149db5a8baefb3b521affb

Author: Giovanni Mascellani <gmascellani at codeweavers.com>
Date:   Mon Jun 27 17:22:39 2022 +0200

vkd3d-shader/hlsl: Fold constant integral max().

Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d-shader/hlsl_constant_ops.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index 64067397..95bed02a 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -369,6 +369,35 @@ static bool fold_mod(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
     return true;
 }
 
+static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
+        struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2)
+{
+    enum hlsl_base_type type = dst->node.data_type->base_type;
+    unsigned int k;
+
+    assert(type == src1->node.data_type->base_type);
+    assert(type == src2->node.data_type->base_type);
+
+    for (k = 0; k < dst->node.data_type->dimx; ++k)
+    {
+        switch (type)
+        {
+            case HLSL_TYPE_INT:
+                dst->value[k].i = max(src1->value[k].i, src2->value[k].i);
+                break;
+
+            case HLSL_TYPE_UINT:
+                dst->value[k].u = max(src1->value[k].u, src2->value[k].u);
+                break;
+
+            default:
+                FIXME("Fold max for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
+                return false;
+        }
+    }
+    return true;
+}
+
 bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context)
 {
     struct hlsl_ir_constant *arg1, *arg2 = NULL, *res;
@@ -430,6 +459,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             success = fold_mod(ctx, res, arg1, arg2);
             break;
 
+        case HLSL_OP2_MAX:
+            success = fold_max(ctx, res, arg1, arg2);
+            break;
+
         default:
             FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op));
             success = false;




More information about the wine-cvs mailing list