[PATCH v3 0/1] MR203: vkd3d-shader/hlsl: Fold constant integral abs().

[Ethan Lee (＠flibitijibibo)]

Found while running a bunch of D3D9 shaders through MojoShader's HLSL emitter.

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

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

[PATCH v3 1/1] vkd3d-shader/hlsl: Fold constant integral abs().

[Ethan Lee]

From: Ethan Lee

Signed-off-by: Ethan Lee 
---
 libs/vkd3d-shader/hlsl_constant_ops.c | 43 +++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index f5bd1bc1..15d4462b 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -22,6 +22,45 @@

#include "hlsl.h"

+static bool fold_abs(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src)
+{
+    enum hlsl_base_type type = dst->node.data_type->base_type;
+    unsigned int k;
+
+    assert(type == src->node.data_type->base_type);
+
+    for (k = 0; k < 4; ++k)
+    {
+        switch (type)
+        {
+            case HLSL_TYPE_FLOAT:
+            case HLSL_TYPE_HALF:
+                dst->value.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);
+                break;
+
+            case HLSL_TYPE_INT:
+                /* abs(INT_MIN) is undefined, leave this expression alone */
+                if (src->value.u[k].i == INT_MIN)
+                    return false;
+                dst->value.u[k].i = abs(src->value.u[k].i);
+                break;
+
+            case HLSL_TYPE_UINT:
+                dst->value.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));
+                return false;
+        }
+    }
+    return true;
+}
+
 static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src)
 {
     unsigned int k;
@@ -533,6 +572,10 @@ 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);
+            break;
+
         case HLSL_OP1_CAST:
             success = fold_cast(ctx, res, arg1);
             break;

[Ethan Lee (＠flibitijibibo)]

On Tue May  9 14:46:34 2023 +0000, Giovanni Mascellani wrote:
> That's fine for me.

Latest revision includes this check!

[PATCH v3 0/1] MR203: vkd3d-shader/hlsl: Fold constant integral abs(). - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.