=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Implement SM4 imad instruction.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Mon Jan 18 21:16:46 2016 +0100

wined3d: Implement SM4 imad instruction.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/glsl_shader.c | 2 +-
 dlls/wined3d/shader_sm4.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 51d2cce..07a8fc4 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -7983,7 +7983,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_IFC                   */ shader_glsl_ifc,
     /* WINED3DSIH_IGE                   */ shader_glsl_relop,
     /* WINED3DSIH_ILT                   */ NULL,
-    /* WINED3DSIH_IMAD                  */ NULL,
+    /* WINED3DSIH_IMAD                  */ shader_glsl_mad,
     /* WINED3DSIH_IMAX                  */ shader_glsl_map2gl,
     /* WINED3DSIH_IMIN                  */ shader_glsl_map2gl,
     /* WINED3DSIH_IMUL                  */ shader_glsl_imul,
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 6972ea4..fb104fc 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -282,7 +282,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_ILT,                    WINED3DSIH_ILT,                 "U",    "II"},
-    {WINED3D_SM4_OP_IMAD,                   WINED3DSIH_IMAD,                "I",    "II"},
+    {WINED3D_SM4_OP_IMAD,                   WINED3DSIH_IMAD,                "I",    "III"},
     {WINED3D_SM4_OP_IMAX,                   WINED3DSIH_IMAX,                "I",    "II"},
     {WINED3D_SM4_OP_IMIN,                   WINED3DSIH_IMIN,                "I",    "II"},
     {WINED3D_SM4_OP_IMUL,                   WINED3DSIH_IMUL,                "II",   "II"},