[PATCH 0/5] MR205: hlsl: Return hlsl_ir_node pointers from instruction constructors, part 5.

[Zebediah Figura (＠zfigura)]

Pass struct hlsl_constant_value to folding functions, in preparation for
creating the destination constant instruction from that value.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/205

[PATCH 1/5] vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_cast().

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

---
 libs/vkd3d-shader/hlsl_constant_ops.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index f5bd1bc1..3ab0a9b8 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -22,7 +22,8 @@
 
 #include "hlsl.h"
 
-static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src)
+static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
+        const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src)
 {
     unsigned int k;
     uint32_t u;
@@ -30,11 +31,11 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct
     double d;
     float f;
 
-    if (dst->node.data_type->dimx != src->node.data_type->dimx
-            || dst->node.data_type->dimy != src->node.data_type->dimy)
+    if (dst_type->dimx != src->node.data_type->dimx
+            || dst_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, dst->node.data_type));
+                debug_hlsl_type(ctx, dst_type));
         return false;
     }
 
@@ -82,23 +83,23 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct
                 vkd3d_unreachable();
         }
 
-        switch (dst->node.data_type->base_type)
+        switch (dst_type->base_type)
         {
             case HLSL_TYPE_FLOAT:
             case HLSL_TYPE_HALF:
-                dst->value.u[k].f = f;
+                dst->u[k].f = f;
                 break;
 
             case HLSL_TYPE_DOUBLE:
-                dst->value.u[k].d = d;
+                dst->u[k].d = d;
                 break;
 
             case HLSL_TYPE_INT:
-                dst->value.u[k].i = i;
+                dst->u[k].i = i;
                 break;
 
             case HLSL_TYPE_UINT:
-                dst->value.u[k].u = u;
+                dst->u[k].u = u;
                 break;
 
             case HLSL_TYPE_BOOL:
@@ -534,7 +535,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
     switch (expr->op)
     {
         case HLSL_OP1_CAST:
-            success = fold_cast(ctx, res, arg1);
+            success = fold_cast(ctx, &res->value, instr->data_type, arg1);
             break;
 
         case HLSL_OP1_NEG:
-- 
GitLab


https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/205

[PATCH 2/5] vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_neg().

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

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

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index 3ab0a9b8..b111a3df 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -111,9 +111,10 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
     return true;
 }
 
-static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src)
+static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
+        const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src)
 {
-    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 == src->node.data_type->base_type);
@@ -124,20 +125,20 @@ static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct
         {
             case HLSL_TYPE_FLOAT:
             case HLSL_TYPE_HALF:
-                dst->value.u[k].f = -src->value.u[k].f;
+                dst->u[k].f = -src->value.u[k].f;
                 break;
 
             case HLSL_TYPE_DOUBLE:
-                dst->value.u[k].d = -src->value.u[k].d;
+                dst->u[k].d = -src->value.u[k].d;
                 break;
 
             case HLSL_TYPE_INT:
             case HLSL_TYPE_UINT:
-                dst->value.u[k].u = -src->value.u[k].u;
+                dst->u[k].u = -src->value.u[k].u;
                 break;
 
             default:
-                FIXME("Fold negation for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
+                FIXME("Fold negation for type %s.\n", debug_hlsl_type(ctx, dst_type));
                 return false;
         }
     }
@@ -539,7 +540,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             break;
 
         case HLSL_OP1_NEG:
-            success = fold_neg(ctx, res, arg1);
+            success = fold_neg(ctx, &res->value, instr->data_type, arg1);
             break;
 
         case HLSL_OP2_ADD:
-- 
GitLab


https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/205

[PATCH 3/5] vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_add().

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

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

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index b111a3df..0b08fa17 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -145,10 +145,10 @@ static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
     return true;
 }
 
-static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src1,
-        struct hlsl_ir_constant *src2)
+static bool fold_add(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);
@@ -160,22 +160,22 @@ static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct
         {
             case HLSL_TYPE_FLOAT:
             case HLSL_TYPE_HALF:
-                dst->value.u[k].f = src1->value.u[k].f + src2->value.u[k].f;
+                dst->u[k].f = src1->value.u[k].f + src2->value.u[k].f;
                 break;
 
             case HLSL_TYPE_DOUBLE:
-                dst->value.u[k].d = src1->value.u[k].d + src2->value.u[k].d;
+                dst->u[k].d = src1->value.u[k].d + src2->value.u[k].d;
                 break;
 
             /* Handling HLSL_TYPE_INT through the unsigned field to avoid
              * undefined behavior with signed integers in C. */
             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 addition for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
+                FIXME("Fold addition for type %s.\n", debug_hlsl_type(ctx, dst_type));
                 return false;
         }
     }
@@ -544,7 +544,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             break;
 
         case HLSL_OP2_ADD:
-            success = fold_add(ctx, res, arg1, arg2);
+            success = fold_add(ctx, &res->value, instr->data_type, arg1, arg2);
             break;
 
         case HLSL_OP2_MUL:
-- 
GitLab


https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/205

[PATCH 4/5] vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_mul().

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

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

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index 0b08fa17..7361a010 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -182,10 +182,10 @@ static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons
     return true;
 }
 
-static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
-        struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2)
+static bool fold_mul(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);
@@ -197,20 +197,20 @@ static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
         {
             case HLSL_TYPE_FLOAT:
             case HLSL_TYPE_HALF:
-                dst->value.u[k].f = src1->value.u[k].f * src2->value.u[k].f;
+                dst->u[k].f = src1->value.u[k].f * src2->value.u[k].f;
                 break;
 
             case HLSL_TYPE_DOUBLE:
-                dst->value.u[k].d = src1->value.u[k].d * src2->value.u[k].d;
+                dst->u[k].d = src1->value.u[k].d * src2->value.u[k].d;
                 break;
 
             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 multiplication for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
+                FIXME("Fold multiplication for type %s.\n", debug_hlsl_type(ctx, dst_type));
                 return false;
         }
     }
@@ -548,7 +548,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             break;
 
         case HLSL_OP2_MUL:
-            success = fold_mul(ctx, res, arg1, arg2);
+            success = fold_mul(ctx, &res->value, instr->data_type, arg1, arg2);
             break;
 
         case HLSL_OP2_NEQUAL:
-- 
GitLab


https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/205

[PATCH 5/5] vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_nequal().

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

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

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index 7361a010..4382317e 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -217,12 +217,12 @@ static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons
     return true;
 }
 
-static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
-        struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2)
+static bool fold_nequal(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)
 {
     unsigned int k;
 
-    assert(dst->node.data_type->base_type == HLSL_TYPE_BOOL);
+    assert(dst_type->base_type == HLSL_TYPE_BOOL);
     assert(src1->node.data_type->base_type == src2->node.data_type->base_type);
 
     for (k = 0; k < 4; ++k)
@@ -231,24 +231,24 @@ static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
         {
             case HLSL_TYPE_FLOAT:
             case HLSL_TYPE_HALF:
-                dst->value.u[k].u = src1->value.u[k].f != src2->value.u[k].f;
+                dst->u[k].u = src1->value.u[k].f != src2->value.u[k].f;
                 break;
 
             case HLSL_TYPE_DOUBLE:
-                dst->value.u[k].u = src1->value.u[k].d != src2->value.u[k].d;
+                dst->u[k].u = src1->value.u[k].d != src2->value.u[k].d;
                 break;
 
             case HLSL_TYPE_INT:
             case HLSL_TYPE_UINT:
             case HLSL_TYPE_BOOL:
-                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:
                 vkd3d_unreachable();
         }
 
-        dst->value.u[k].u *= ~0u;
+        dst->u[k].u *= ~0u;
     }
     return true;
 }
@@ -552,7 +552,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             break;
 
         case HLSL_OP2_NEQUAL:
-            success = fold_nequal(ctx, res, arg1, arg2);
+            success = fold_nequal(ctx, &res->value, instr->data_type, arg1, arg2);
             break;
 
         case HLSL_OP2_DIV:
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/205

[PATCH 0/5] MR205: hlsl: Return hlsl_ir_node pointers from instruction constructors, part 5. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/205

[Henri Verbeet (＠hverbeet)]

I think this needs a rebase after !203.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/205#note_33376