Józef Kucia : wined3d: Recognize SM4 imin opcode.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1ef7eddfcbf3b3d021898ea3535ca18d165dbbbf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1ef7eddfcbf3b3d021898ea353...

Author: Józef Kucia 
Date:   Fri Jan  1 18:08:04 2016 +0100

wined3d: Recognize SM4 imin opcode.

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/arb_program_shader.c | 1 +
 dlls/wined3d/glsl_shader.c        | 1 +
 dlls/wined3d/shader.c             | 1 +
 dlls/wined3d/shader_sm4.c         | 2 ++
 dlls/wined3d/wined3d_private.h    | 1 +
 5 files changed, 6 insertions(+)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 62caa2a..3dfc8c4 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5258,6 +5258,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_IFC                   */ shader_hw_ifc,
     /* WINED3DSIH_IGE                   */ NULL,
     /* WINED3DSIH_IMAX                  */ NULL,
+    /* WINED3DSIH_IMIN                  */ NULL,
     /* WINED3DSIH_IMUL                  */ NULL,
     /* WINED3DSIH_ISHL                  */ NULL,
     /* WINED3DSIH_ITOF                  */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 9d2cc16..ed87e79 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -7858,6 +7858,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_IFC                   */ shader_glsl_ifc,
     /* WINED3DSIH_IGE                   */ shader_glsl_relop,
     /* WINED3DSIH_IMAX                  */ NULL,
+    /* WINED3DSIH_IMIN                  */ NULL,
     /* WINED3DSIH_IMUL                  */ shader_glsl_imul,
     /* WINED3DSIH_ISHL                  */ shader_glsl_binop,
     /* WINED3DSIH_ITOF                  */ shader_glsl_to_float,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 417d20e..bf420ee 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -86,6 +86,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_IFC                   */ "ifc",
     /* WINED3DSIH_IGE                   */ "ige",
     /* WINED3DSIH_IMAX                  */ "imax",
+    /* WINED3DSIH_IMIN                  */ "imin",
     /* WINED3DSIH_IMUL                  */ "imul",
     /* WINED3DSIH_ISHL                  */ "ishl",
     /* WINED3DSIH_ITOF                  */ "itof",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index b813f2e..a915b0d 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -99,6 +99,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_IEQ                  = 0x20,
     WINED3D_SM4_OP_IGE                  = 0x21,
     WINED3D_SM4_OP_IMAX                 = 0x24,
+    WINED3D_SM4_OP_IMIN                 = 0x25,
     WINED3D_SM4_OP_IMUL                 = 0x26,
     WINED3D_SM4_OP_ISHL                 = 0x29,
     WINED3D_SM4_OP_ITOF                 = 0x2b,
@@ -269,6 +270,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_IEQ,                    WINED3DSIH_IEQ,                 "U",    "II"},
     {WINED3D_SM4_OP_IGE,                    WINED3DSIH_IGE,                 "U",    "II"},
     {WINED3D_SM4_OP_IMAX,                   WINED3DSIH_IMAX,                "I",    "II"},
+    {WINED3D_SM4_OP_IMIN,                   WINED3DSIH_IMIN,                "I",    "II"},
     {WINED3D_SM4_OP_IMUL,                   WINED3DSIH_IMUL,                "II",   "II"},
     {WINED3D_SM4_OP_ISHL,                   WINED3DSIH_ISHL,                "I",    "II"},
     {WINED3D_SM4_OP_ITOF,                   WINED3DSIH_ITOF,                "F",    "I"},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index fb16aac..23fe595 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -501,6 +501,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_IFC,
     WINED3DSIH_IGE,
     WINED3DSIH_IMAX,
+    WINED3DSIH_IMIN,
     WINED3DSIH_IMUL,
     WINED3DSIH_ISHL,
     WINED3DSIH_ITOF,