Zebediah Figura : vkd3d-shader/hlsl: Write SM4 casts to uint.

Alexandre Julliard julliard at winehq.org
Wed Sep 15 16:20:12 CDT 2021


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

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Thu Sep  9 21:11:38 2021 -0500

vkd3d-shader/hlsl: Write SM4 casts to uint.

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

---

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

diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
index 0660dd5..855804e 100644
--- a/libs/vkd3d-shader/hlsl_sm4.c
+++ b/libs/vkd3d-shader/hlsl_sm4.c
@@ -1086,6 +1086,51 @@ static void write_sm4_expr(struct hlsl_ctx *ctx,
             break;
         }
 
+        case HLSL_TYPE_UINT:
+        {
+            switch (expr->op)
+            {
+                case HLSL_OP1_CAST:
+                {
+                    const struct hlsl_type *src_type = arg1->data_type;
+
+                    /* Narrowing casts need to be lowered. */
+                    if (src_type->dimx != expr->node.data_type->dimx)
+                        hlsl_fixme(ctx, expr->node.loc, "SM4 narrowing cast.\n");
+
+                    switch (src_type->base_type)
+                    {
+                        case HLSL_TYPE_HALF:
+                        case HLSL_TYPE_FLOAT:
+                            write_sm4_unary_op(buffer, VKD3D_SM4_OP_FTOU, &expr->node, arg1, 0);
+                            break;
+
+                        case HLSL_TYPE_INT:
+                        case HLSL_TYPE_UINT:
+                            write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, 0);
+                            break;
+
+                        case HLSL_TYPE_BOOL:
+                            hlsl_fixme(ctx, expr->node.loc, "SM4 cast from bool to uint.\n");
+                            break;
+
+                        case HLSL_TYPE_DOUBLE:
+                            hlsl_fixme(ctx, expr->node.loc, "SM4 cast from double to uint.\n");
+                            break;
+
+                        default:
+                            break;
+                    }
+                    break;
+                }
+
+                default:
+                    hlsl_fixme(ctx, expr->node.loc, "SM4 uint \"%s\" expression.\n", debug_hlsl_expr_op(expr->op));
+                    break;
+            }
+            break;
+        }
+
         default:
         {
             struct vkd3d_string_buffer *string;




More information about the wine-cvs mailing list