Conor McCarthy : vkd3d-shader: Implement DGE instruction.

[Alexandre Julliard]

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

Author: Conor McCarthy <cmccarthy at codeweavers.com>
Date:   Wed Aug  4 12:56:08 2021 +1000

vkd3d-shader: Implement DGE instruction.

Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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                            | 6 +++---
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 2691125..afeebb2 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -312,6 +312,7 @@ enum vkd3d_sm4_opcode
     VKD3D_SM5_OP_SYNC                             = 0xbe,
     VKD3D_SM5_OP_DADD                             = 0xbf,
     VKD3D_SM5_OP_DEQ                              = 0xc3,
+    VKD3D_SM5_OP_DGE                              = 0xc4,
     VKD3D_SM5_OP_DMOV                             = 0xc7,
     VKD3D_SM5_OP_EVAL_SAMPLE_INDEX                = 0xcc,
     VKD3D_SM5_OP_EVAL_CENTROID                    = 0xcd,
@@ -1254,6 +1255,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] =
             shader_sm5_read_sync},
     {VKD3D_SM5_OP_DADD,                             VKD3DSIH_DADD,                             "d",    "dd"},
     {VKD3D_SM5_OP_DEQ,                              VKD3DSIH_DEQ,                              "u",    "dd"},
+    {VKD3D_SM5_OP_DGE,                              VKD3DSIH_DGE,                              "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 a1f061c..eb63e82 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -7355,6 +7355,7 @@ static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_co
     {
         case VKD3DSIH_DEQ:
         case VKD3DSIH_EQ:  op = SpvOpFOrdEqual; break;
+        case VKD3DSIH_DGE:
         case VKD3DSIH_GE:  op = SpvOpFOrdGreaterThanEqual; break;
         case VKD3DSIH_IEQ: op = SpvOpIEqual; break;
         case VKD3DSIH_IGE: op = SpvOpSGreaterThanEqual; break;
@@ -9571,6 +9572,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler,
             vkd3d_dxbc_compiler_emit_udiv(compiler, instruction);
             break;
         case VKD3DSIH_DEQ:
+        case VKD3DSIH_DGE:
         case VKD3DSIH_EQ:
         case VKD3DSIH_GE:
         case VKD3DSIH_IEQ:
diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index 592befe..ee4ebb1 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -105,6 +105,7 @@ static const char * const shader_opcode_names[] =
     /* VKD3DSIH_DEFB                             */ "defb",
     /* VKD3DSIH_DEFI                             */ "defi",
     /* VKD3DSIH_DEQ                              */ "deq",
+    /* VKD3DSIH_DGE                              */ "dge",
     /* VKD3DSIH_DIV                              */ "div",
     /* VKD3DSIH_DMOV                             */ "dmov",
     /* VKD3DSIH_DP2                              */ "dp2",
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 23f2b23..14d2d74 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -194,6 +194,7 @@ enum vkd3d_shader_opcode
     VKD3DSIH_DEFB,
     VKD3DSIH_DEFI,
     VKD3DSIH_DEQ,
+    VKD3DSIH_DGE,
     VKD3DSIH_DIV,
     VKD3DSIH_DMOV,
     VKD3DSIH_DP2,
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 6b22580..c8dc460 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -9944,9 +9944,9 @@ static void test_shader_instructions(void)
         {&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_dge, {.d = {{0.0, 1.0}}}, {{0x00000000}}, true, true},
-        {&ps_dge, {.d = {{1.0, 1.0}}}, {{0xffffffff}}, true, true},
-        {&ps_dge, {.d = {{1.5, 1.0}}}, {{0xffffffff}}, true, 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},
         {&ps_dlt, {.d = {{0.0, 1.0}}}, {{0xffffffff}}, true, true},
         {&ps_dlt, {.d = {{1.0, 1.0}}}, {{0x00000000}}, true, true},
         {&ps_dtou, {.d = {{     -NAN}}}, {{ 0,  0 }}, true, true},