Conor McCarthy : vkd3d-shader: Implement DMAX instruction.

[Alexandre Julliard]

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

Author: Conor McCarthy <cmccarthy at codeweavers.com>
Date:   Tue Aug 10 01:12:28 2021 +1000

vkd3d-shader: Implement DMAX 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                 | 1 +
 libs/vkd3d-shader/sm4.h                  | 1 +
 libs/vkd3d-shader/spirv.c                | 2 ++
 libs/vkd3d-shader/trace.c                | 1 +
 libs/vkd3d-shader/vkd3d_shader_private.h | 1 +
 5 files changed, 6 insertions(+)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 9da89a4..584ece9 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -798,6 +798,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] =
     {VKD3D_SM5_OP_SYNC,                             VKD3DSIH_SYNC,                             "",     "",
             shader_sm5_read_sync},
     {VKD3D_SM5_OP_DADD,                             VKD3DSIH_DADD,                             "d",    "dd"},
+    {VKD3D_SM5_OP_DMAX,                             VKD3DSIH_DMAX,                             "d",    "dd"},
     {VKD3D_SM5_OP_DEQ,                              VKD3DSIH_DEQ,                              "u",    "dd"},
     {VKD3D_SM5_OP_DGE,                              VKD3DSIH_DGE,                              "u",    "dd"},
     {VKD3D_SM5_OP_DLT,                              VKD3DSIH_DLT,                              "u",    "dd"},
diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h
index c94a73d..e4d2146 100644
--- a/libs/vkd3d-shader/sm4.h
+++ b/libs/vkd3d-shader/sm4.h
@@ -318,6 +318,7 @@ enum vkd3d_sm4_opcode
     VKD3D_SM5_OP_IMM_ATOMIC_UMIN                  = 0xbd,
     VKD3D_SM5_OP_SYNC                             = 0xbe,
     VKD3D_SM5_OP_DADD                             = 0xbf,
+    VKD3D_SM5_OP_DMAX                             = 0xc0,
     VKD3D_SM5_OP_DEQ                              = 0xc3,
     VKD3D_SM5_OP_DGE                              = 0xc4,
     VKD3D_SM5_OP_DLT                              = 0xc5,
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 3a1f196..a94a38a 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -6843,6 +6843,7 @@ static enum GLSLstd450 vkd3d_dxbc_compiler_map_ext_glsl_instruction(
     }
     glsl_insts[] =
     {
+        {VKD3DSIH_DMAX,            GLSLstd450NMax},
         {VKD3DSIH_EXP,             GLSLstd450Exp2},
         {VKD3DSIH_FIRSTBIT_HI,     GLSLstd450FindUMsb},
         {VKD3DSIH_FIRSTBIT_LO,     GLSLstd450FindILsb},
@@ -9532,6 +9533,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler,
         case VKD3DSIH_XOR:
             vkd3d_dxbc_compiler_emit_alu_instruction(compiler, instruction);
             break;
+        case VKD3DSIH_DMAX:
         case VKD3DSIH_EXP:
         case VKD3DSIH_FIRSTBIT_HI:
         case VKD3DSIH_FIRSTBIT_LO:
diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index d9306d6..0da29a8 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -108,6 +108,7 @@ static const char * const shader_opcode_names[] =
     /* VKD3DSIH_DGE                              */ "dge",
     /* VKD3DSIH_DIV                              */ "div",
     /* VKD3DSIH_DLT                              */ "dlt",
+    /* VKD3DSIH_DMAX                             */ "dmax",
     /* VKD3DSIH_DMOV                             */ "dmov",
     /* VKD3DSIH_DNE                              */ "dne",
     /* VKD3DSIH_DP2                              */ "dp2",
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index cd3cd49..96e8fb3 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -197,6 +197,7 @@ enum vkd3d_shader_opcode
     VKD3DSIH_DGE,
     VKD3DSIH_DIV,
     VKD3DSIH_DLT,
+    VKD3DSIH_DMAX,
     VKD3DSIH_DMOV,
     VKD3DSIH_DNE,
     VKD3DSIH_DP2,