Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_and().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 1049f489bb252e3551c54b88ce9181b6780b98ef
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/1049f489bb252e3551c54b88ce9181...

Author: Zebediah Figura 
Date:   Fri Nov 11 18:57:25 2022 -0600

vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_bit_and().

---

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

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index 6dab6741..a00d017a 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -490,26 +490,26 @@ static bool fold_bit_xor(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
     return true;
 }

-static bool fold_bit_and(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
-        struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2)
+static bool fold_bit_and(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type,
+        const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2)
 {
-    enum hlsl_base_type type = dst->node.data_type->base_type;
+    enum hlsl_base_type type = dst_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)
+    for (k = 0; k < dst_type->dimx; ++k)
     {
         switch (type)
         {
             case HLSL_TYPE_INT:
             case HLSL_TYPE_UINT:
-                dst->value.u[k].u = src1->value.u[k].u & src2->value.u[k].u;
+                dst->u[k].u = src1->value.u[k].u & src2->value.u[k].u;
                 break;

default:
-                FIXME("Fold bit and for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
+                FIXME("Fold bit and for type %s.\n", debug_hlsl_type(ctx, dst_type));
                 return false;
         }
     }
@@ -621,7 +621,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             break;

case HLSL_OP2_BIT_AND:
-            success = fold_bit_and(ctx, res, arg1, arg2);
+            success = fold_bit_and(ctx, &res->value, instr->data_type, arg1, arg2);
             break;

case HLSL_OP2_BIT_OR: