[PATCH 0/2] MR136: vkd3d-shader/hlsl: Handle discard statement.

[PATCH 1/2] vkd3d-shader/trace: Fix discard instruction tracing for sm4+.

[Nikolay Sivov]

From: Nikolay Sivov

---
 libs/vkd3d-shader/dxbc.c                 | 2 +-
 libs/vkd3d-shader/trace.c                | 3 ++-
 libs/vkd3d-shader/vkd3d_shader_private.h | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index d99ea2e3..e0e3ff8d 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -633,7 +633,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] =
     {VKD3D_SM4_OP_DEFAULT,                          VKD3DSIH_DEFAULT,                          "",     ""},
     {VKD3D_SM4_OP_DERIV_RTX,                        VKD3DSIH_DSX,                              "f",    "f"},
     {VKD3D_SM4_OP_DERIV_RTY,                        VKD3DSIH_DSY,                              "f",    "f"},
-    {VKD3D_SM4_OP_DISCARD,                          VKD3DSIH_TEXKILL,                          "",     "u",
+    {VKD3D_SM4_OP_DISCARD,                          VKD3DSIH_DISCARD,                          "",     "u",
             shader_sm4_read_conditional_op},
     {VKD3D_SM4_OP_DIV,                              VKD3DSIH_DIV,                              "f",    "ff"},
     {VKD3D_SM4_OP_DP2,                              VKD3DSIH_DP2,                              "f",    "ff"},
diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index 6cd2dcb2..85e38fe6 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -109,6 +109,7 @@ static const char * const shader_opcode_names[] =
     [VKD3DSIH_DEQ                             ] = "deq",
     [VKD3DSIH_DFMA                            ] = "dfma",
     [VKD3DSIH_DGE                             ] = "dge",
+    [VKD3DSIH_DISCARD                         ] = "discard",
     [VKD3DSIH_DIV                             ] = "div",
     [VKD3DSIH_DLT                             ] = "dlt",
     [VKD3DSIH_DMAX                            ] = "dmax",
@@ -1507,7 +1508,7 @@ static void shader_dump_instruction_flags(struct vkd3d_d3d_asm_compiler *compile
         case VKD3DSIH_CONTINUEP:
         case VKD3DSIH_IF:
         case VKD3DSIH_RETP:
-        case VKD3DSIH_TEXKILL:
+        case VKD3DSIH_DISCARD:
             switch (ins->flags)
             {
                 case VKD3D_SHADER_CONDITIONAL_OP_NZ: shader_addline(buffer, "_nz"); break;
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 85d50cbd..1492b630 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -223,6 +223,7 @@ enum vkd3d_shader_opcode
     VKD3DSIH_DEQ,
     VKD3DSIH_DFMA,
     VKD3DSIH_DGE,
+    VKD3DSIH_DISCARD,
     VKD3DSIH_DIV,
     VKD3DSIH_DLT,
     VKD3DSIH_DMAX,

[PATCH 2/2] vkd3d-shader/hlsl: Handle discard statement.

[Nikolay Sivov]

From: Nikolay Sivov

---
 libs/vkd3d-shader/hlsl.y     | 14 ++++++++++++++
 libs/vkd3d-shader/hlsl_sm4.c | 16 ++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index fd1eaf6e..89c71ce5 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -3933,6 +3933,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
 %type <list> conditional_expr
 %type <list> declaration
 %type <list> declaration_statement
+%type <list> discard_statement
 %type <list> equality_expr
 %type <list> expr
 %type <list> expr_optional
@@ -5145,6 +5146,7 @@ statement:
       declaration_statement
     | expr_statement
     | compound_statement
+    | discard_statement
     | jump_statement
     | selection_statement
     | loop_statement
@@ -5164,6 +5166,18 @@ jump_statement:
                 YYABORT;
         }

+discard_statement:
+      KW_DISCARD ';'
+        {
+            struct hlsl_ir_jump *discard;
+
+            if (!($$ = make_empty_list(ctx)))
+                YYABORT;
+            if (!(discard = hlsl_new_jump(ctx, HLSL_IR_JUMP_DISCARD, @1)))
+                return false;
+            list_add_tail($$, &discard->node.entry);
+        }
+
 selection_statement:
       KW_IF '(' expr ')' if_body
         {
diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
index f81be3e9..c3b2dac2 100644
--- a/libs/vkd3d-shader/hlsl_sm4.c
+++ b/libs/vkd3d-shader/hlsl_sm4.c
@@ -2137,6 +2137,22 @@ static void write_sm4_jump(struct hlsl_ctx *ctx,
             instr.opcode = VKD3D_SM4_OP_BREAK;
             break;

+        case HLSL_IR_JUMP_DISCARD:
+        {
+            struct sm4_register *reg = &instr.srcs[0].reg;
+
+            instr.opcode = VKD3D_SM4_OP_DISCARD | VKD3D_SM4_CONDITIONAL_NZ;
+
+            memset(&instr.srcs[0], 0, sizeof(*instr.srcs));
+            instr.srcs[0].swizzle_type = VKD3D_SM4_SWIZZLE_NONE;
+            instr.src_count = 1;
+            reg->type = VKD3D_SM4_RT_IMMCONST;
+            reg->dim = VKD3D_SM4_DIMENSION_SCALAR;
+            reg->immconst_uint[0] = ~0u;
+
+            break;
+        }
+
         case HLSL_IR_JUMP_RETURN:
             vkd3d_unreachable();

[Giovanni Mascellani (＠giomasce)]

Doesn't seem wrong, but as usual I think that some tests would be appropriate.