From f54797bae5754fdb96715a422153b24bfa0d0e7d Mon Sep 17 00:00:00 2001
From: Shaun Ren <sren@codeweavers.com>
Date: Fri, 18 Oct 2024 21:50:41 -0400
Subject: [PATCH] vkd3d-shader/hlsl: Support discard for SM1.

---
 libs/vkd3d-shader/hlsl_codegen.c | 42 ++++++++++++++++++++++++++++++++
 tests/hlsl/discard.shader_test   |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 37e99a25..3da96745 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -4079,6 +4079,44 @@ static bool lower_discard_neg(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
     return true;
 }
 
+static bool lower_discard_nz(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context)
+{
+    struct hlsl_ir_node *cond, *cond_cast, *abs, *neg;
+    struct hlsl_type *float_type;
+    struct hlsl_ir_jump *jump;
+    struct hlsl_block block;
+
+    if (instr->type != HLSL_IR_JUMP)
+        return false;
+    jump = hlsl_ir_jump(instr);
+    if (jump->type != HLSL_IR_JUMP_DISCARD_NZ)
+        return false;
+
+    cond = jump->condition.node;
+    float_type = hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, cond->data_type->dimx);
+
+    hlsl_block_init(&block);
+
+    if (!(cond_cast = hlsl_new_cast(ctx, cond, float_type, &instr->loc)))
+        return false;
+    hlsl_block_add_instr(&block, cond_cast);
+
+    if (!(abs = hlsl_new_unary_expr(ctx, HLSL_OP1_ABS, cond_cast, &instr->loc)))
+        return false;
+    hlsl_block_add_instr(&block, abs);
+
+    if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, abs, &instr->loc)))
+        return false;
+    hlsl_block_add_instr(&block, neg);
+
+    list_move_tail(&instr->entry, &block.instrs);
+    hlsl_src_remove(&jump->condition);
+    hlsl_src_from_node(&jump->condition, neg);
+    jump->type = HLSL_IR_JUMP_DISCARD_NEG;
+
+    return true;
+}
+
 static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context)
 {
     switch (instr->type)
@@ -7903,6 +7941,10 @@ static void process_entry_function(struct hlsl_ctx *ctx,
     {
         hlsl_transform_ir(ctx, lower_discard_neg, body, NULL);
     }
+    else
+    {
+        hlsl_transform_ir(ctx, lower_discard_nz, body, NULL);
+    }
 
     transform_unroll_loops(ctx, body);
     hlsl_run_const_passes(ctx, body);
diff --git a/tests/hlsl/discard.shader_test b/tests/hlsl/discard.shader_test
index 633bcb9e..ea85fd76 100644
--- a/tests/hlsl/discard.shader_test
+++ b/tests/hlsl/discard.shader_test
@@ -21,7 +21,7 @@ shader model >= 3.0
 
 % Check that derivatives are still computed after discarding
 % other pixels in the same quad
-[pixel shader todo(sm<4)]
+[pixel shader]
 float4 main(float4 pos : sv_position) : sv_target
 {
     if (frac((floor(pos.x) + floor(pos.y)) / 2) == 0.5)