[PATCH vkd3d 4/4] vkd3d-shader: Implement DNE instruction.

[Conor McCarthy]

Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
---
 libs/vkd3d-shader/dxbc.c                 | 2 ++
 libs/vkd3d-shader/spirv.c                | 2 ++
 libs/vkd3d-shader/trace.c                | 1 +
 libs/vkd3d-shader/vkd3d_shader_private.h | 1 +
 tests/d3d12.c                            | 4 ++--
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index f557f83e..dd18b6f1 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -314,6 +314,7 @@ enum vkd3d_sm4_opcode
     VKD3D_SM5_OP_DEQ                              = 0xc3,
     VKD3D_SM5_OP_DGE                              = 0xc4,
     VKD3D_SM5_OP_DLT                              = 0xc5,
+    VKD3D_SM5_OP_DNE                              = 0xc6,
     VKD3D_SM5_OP_DMOV                             = 0xc7,
     VKD3D_SM5_OP_EVAL_SAMPLE_INDEX                = 0xcc,
     VKD3D_SM5_OP_EVAL_CENTROID                    = 0xcd,
@@ -1258,6 +1259,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] =
     {VKD3D_SM5_OP_DEQ,                              VKD3DSIH_DEQ,                              "u",    "dd"},
     {VKD3D_SM5_OP_DGE,                              VKD3DSIH_DGE,                              "u",    "dd"},
     {VKD3D_SM5_OP_DLT,                              VKD3DSIH_DLT,                              "u",    "dd"},
+    {VKD3D_SM5_OP_DNE,                              VKD3DSIH_DNE,                              "u",    "dd"},
     {VKD3D_SM5_OP_DMOV,                             VKD3DSIH_DMOV,                             "d",    "d"},
     {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX,                VKD3DSIH_EVAL_SAMPLE_INDEX,                "f",    "fi"},
     {VKD3D_SM5_OP_EVAL_CENTROID,                    VKD3DSIH_EVAL_CENTROID,                    "f",    "f"},
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index bb9e2bf5..3a1f1969 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -7363,6 +7363,7 @@ static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_co
         case VKD3DSIH_INE: op = SpvOpINotEqual; break;
         case VKD3DSIH_DLT:
         case VKD3DSIH_LT:  op = SpvOpFOrdLessThan; break;
+        case VKD3DSIH_DNE:
         case VKD3DSIH_NE:  op = SpvOpFUnordNotEqual; break;
         case VKD3DSIH_UGE: op = SpvOpUGreaterThanEqual; break;
         case VKD3DSIH_ULT: op = SpvOpULessThan; break;
@@ -9575,6 +9576,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler,
         case VKD3DSIH_DEQ:
         case VKD3DSIH_DGE:
         case VKD3DSIH_DLT:
+        case VKD3DSIH_DNE:
         case VKD3DSIH_EQ:
         case VKD3DSIH_GE:
         case VKD3DSIH_IEQ:
diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index b35748bc..d9306d6b 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_DIV                              */ "div",
     /* VKD3DSIH_DLT                              */ "dlt",
     /* VKD3DSIH_DMOV                             */ "dmov",
+    /* VKD3DSIH_DNE                              */ "dne",
     /* VKD3DSIH_DP2                              */ "dp2",
     /* VKD3DSIH_DP2ADD                           */ "dp2add",
     /* VKD3DSIH_DP3                              */ "dp3",
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 2ce70dbf..76704d5a 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -198,6 +198,7 @@ enum vkd3d_shader_opcode
     VKD3DSIH_DIV,
     VKD3DSIH_DLT,
     VKD3DSIH_DMOV,
+    VKD3DSIH_DNE,
     VKD3DSIH_DP2,
     VKD3DSIH_DP2ADD,
     VKD3DSIH_DP3,
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 1419225d..e7585177 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -9935,8 +9935,8 @@ static void test_shader_instructions(void)
         {&ps_dmodifier, {.d = {{-1.5, 0.0}}}, {.d = {1.5f, 1.5f}}, true},
         {&ps_deq, {.d = {{0.0, 0.0}}}, {{0xffffffff}}, true},
         {&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true},
-        {&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true, true},
-        {&ps_dne, {.d = {{1.0, 0.0}}}, {{0xffffffff}}, true, true},
+        {&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true},
+        {&ps_dne, {.d = {{1.0, 0.0}}}, {{0xffffffff}}, true},
         {&ps_dge, {.d = {{0.0, 1.0}}}, {{0x00000000}}, true},
         {&ps_dge, {.d = {{1.0, 1.0}}}, {{0xffffffff}}, true},
         {&ps_dge, {.d = {{1.5, 1.0}}}, {{0xffffffff}}, true},
-- 
2.32.0