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

[Zebediah Figura (＠zfigura)]

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

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

[Zebediah Figura]

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

---
 libs/vkd3d-shader/hlsl_constant_ops.c | 35 ++++++++++++++-------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index 80af9b8f..a60ced01 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -293,16 +293,17 @@ static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, c
     return true;
 }
 
-static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
-        struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2)
+static bool fold_div(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,
+        const struct vkd3d_shader_location *loc)
 {
-    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)
         {
@@ -310,13 +311,13 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
             case HLSL_TYPE_HALF:
                 if (ctx->profile->major_version >= 4 && src2->value.u[k].f == 0)
                 {
-                    hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO,
+                    hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO,
                             "Floating point division by zero.");
                 }
-                dst->value.u[k].f = src1->value.u[k].f / src2->value.u[k].f;
-                if (ctx->profile->major_version < 4 && !isfinite(dst->value.u[k].f))
+                dst->u[k].f = src1->value.u[k].f / src2->value.u[k].f;
+                if (ctx->profile->major_version < 4 && !isfinite(dst->u[k].f))
                 {
-                    hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO,
+                    hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO,
                             "Infinities and NaNs are not allowed by the shader model.");
                 }
                 break;
@@ -324,37 +325,37 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
             case HLSL_TYPE_DOUBLE:
                 if (src2->value.u[k].d == 0)
                 {
-                    hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO,
+                    hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO,
                             "Floating point division by zero.");
                 }
-                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:
                 if (src2->value.u[k].i == 0)
                 {
-                    hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO,
+                    hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO,
                             "Division by zero.");
                     return false;
                 }
                 if (src1->value.u[k].i == INT_MIN && src2->value.u[k].i == -1)
-                    dst->value.u[k].i = INT_MIN;
+                    dst->u[k].i = INT_MIN;
                 else
-                    dst->value.u[k].i = src1->value.u[k].i / src2->value.u[k].i;
+                    dst->u[k].i = src1->value.u[k].i / src2->value.u[k].i;
                 break;
 
             case HLSL_TYPE_UINT:
                 if (src2->value.u[k].u == 0)
                 {
-                    hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO,
+                    hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO,
                             "Division by zero.");
                     return false;
                 }
-                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 division for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
+                FIXME("Fold division for type %s.\n", debug_hlsl_type(ctx, dst_type));
                 return false;
         }
     }
@@ -600,7 +601,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             break;
 
         case HLSL_OP2_DIV:
-            success = fold_div(ctx, res, arg1, arg2);
+            success = fold_div(ctx, &res->value, instr->data_type, arg1, arg2, &instr->loc);
             break;
 
         case HLSL_OP2_MOD:
-- 
GitLab


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

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

[Zebediah Figura]

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

---
 libs/vkd3d-shader/hlsl_constant_ops.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index a60ced01..88583231 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -362,44 +362,43 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons
     return true;
 }
 
-static bool fold_mod(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
-        struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2)
+static bool fold_mod(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,
+        const struct vkd3d_shader_location *loc)
 {
-    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:
                 if (src2->value.u[k].i == 0)
                 {
-                    hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO,
-                            "Division by zero.");
+                    hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, "Division by zero.");
                     return false;
                 }
                 if (src1->value.u[k].i == INT_MIN && src2->value.u[k].i == -1)
-                    dst->value.u[k].i = 0;
+                    dst->u[k].i = 0;
                 else
-                    dst->value.u[k].i = src1->value.u[k].i % src2->value.u[k].i;
+                    dst->u[k].i = src1->value.u[k].i % src2->value.u[k].i;
                 break;
 
             case HLSL_TYPE_UINT:
                 if (src2->value.u[k].u == 0)
                 {
-                    hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO,
-                            "Division by zero.");
+                    hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, "Division by zero.");
                     return false;
                 }
-                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 modulus for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
+                FIXME("Fold modulus for type %s.\n", debug_hlsl_type(ctx, dst_type));
                 return false;
         }
     }
@@ -605,7 +604,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             break;
 
         case HLSL_OP2_MOD:
-            success = fold_mod(ctx, res, arg1, arg2);
+            success = fold_mod(ctx, &res->value, instr->data_type, arg1, arg2, &instr->loc);
             break;
 
         case HLSL_OP2_MAX:
-- 
GitLab


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

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

[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 88583231..e249bd2a 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -405,29 +405,29 @@ static bool fold_mod(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons
     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)
+static bool fold_max(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:
-                dst->value.u[k].i = max(src1->value.u[k].i, src2->value.u[k].i);
+                dst->u[k].i = max(src1->value.u[k].i, src2->value.u[k].i);
                 break;
 
             case HLSL_TYPE_UINT:
-                dst->value.u[k].u = max(src1->value.u[k].u, src2->value.u[k].u);
+                dst->u[k].u = max(src1->value.u[k].u, src2->value.u[k].u);
                 break;
 
             default:
-                FIXME("Fold max for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
+                FIXME("Fold max for type %s.\n", debug_hlsl_type(ctx, dst_type));
                 return false;
         }
     }
@@ -608,7 +608,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             break;
 
         case HLSL_OP2_MAX:
-            success = fold_max(ctx, res, arg1, arg2);
+            success = fold_max(ctx, &res->value, instr->data_type, arg1, arg2);
             break;
 
         case HLSL_OP2_MIN:
-- 
GitLab


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

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

[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 e249bd2a..ae2fd5a5 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -434,29 +434,29 @@ static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons
     return true;
 }
 
-static bool fold_min(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
-        struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2)
+static bool fold_min(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:
-                dst->value.u[k].i = min(src1->value.u[k].i, src2->value.u[k].i);
+                dst->u[k].i = min(src1->value.u[k].i, src2->value.u[k].i);
                 break;
 
             case HLSL_TYPE_UINT:
-                dst->value.u[k].u = min(src1->value.u[k].u, src2->value.u[k].u);
+                dst->u[k].u = min(src1->value.u[k].u, src2->value.u[k].u);
                 break;
 
             default:
-                FIXME("Fold min for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
+                FIXME("Fold min for type %s.\n", debug_hlsl_type(ctx, dst_type));
                 return false;
         }
     }
@@ -612,7 +612,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             break;
 
         case HLSL_OP2_MIN:
-            success = fold_min(ctx, res, arg1, arg2);
+            success = fold_min(ctx, &res->value, instr->data_type, arg1, arg2);
             break;
 
         case HLSL_OP2_BIT_XOR:
-- 
GitLab


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

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

[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 ae2fd5a5..9fa2acd5 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -22,40 +22,41 @@
 
 #include "hlsl.h"
 
-static bool fold_abs(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src)
+static bool fold_abs(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);
 
-    for (k = 0; k < 4; ++k)
+    for (k = 0; k < dst_type->dimx; ++k)
     {
         switch (type)
         {
             case HLSL_TYPE_FLOAT:
             case HLSL_TYPE_HALF:
-                dst->value.u[k].f = fabsf(src->value.u[k].f);
+                dst->u[k].f = fabsf(src->value.u[k].f);
                 break;
 
             case HLSL_TYPE_DOUBLE:
-                dst->value.u[k].d = fabs(src->value.u[k].d);
+                dst->u[k].d = fabs(src->value.u[k].d);
                 break;
 
             case HLSL_TYPE_INT:
                 /* C's abs(INT_MIN) is undefined, but HLSL evaluates this to INT_MIN */
                 if (src->value.u[k].i == INT_MIN)
-                    dst->value.u[k].i = INT_MIN;
+                    dst->u[k].i = INT_MIN;
                 else
-                    dst->value.u[k].i = abs(src->value.u[k].i);
+                    dst->u[k].i = abs(src->value.u[k].i);
                 break;
 
             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 abs() for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
+                FIXME("Fold abs() for type %s.\n", debug_hlsl_type(ctx, dst_type));
                 return false;
         }
     }
@@ -576,7 +577,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
     switch (expr->op)
     {
         case HLSL_OP1_ABS:
-            success = fold_abs(ctx, res, arg1);
+            success = fold_abs(ctx, &res->value, instr->data_type, arg1);
             break;
 
         case HLSL_OP1_CAST:
-- 
GitLab

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

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

[Giovanni Mascellani (＠giomasce)]

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

[Giovanni Mascellani (＠giomasce)]

Boring.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/210#note_33936

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

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/210