=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Recognize SM4 not opcode.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Tue Jan 26 17:49:14 2016 +0100

wined3d: Recognize SM4 not opcode.

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/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 8347802..5dfa92f 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5290,6 +5290,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_MUL                   */ shader_hw_map2gl,
     /* WINED3DSIH_NE                    */ NULL,
     /* WINED3DSIH_NOP                   */ shader_hw_nop,
+    /* WINED3DSIH_NOT                   */ NULL,
     /* WINED3DSIH_NRM                   */ shader_hw_nrm,
     /* WINED3DSIH_OR                    */ NULL,
     /* WINED3DSIH_PHASE                 */ shader_hw_nop,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index c8ba074..4be81a5 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8050,6 +8050,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_MUL                   */ shader_glsl_binop,
     /* WINED3DSIH_NE                    */ shader_glsl_relop,
     /* WINED3DSIH_NOP                   */ shader_glsl_nop,
+    /* WINED3DSIH_NOT                   */ NULL,
     /* WINED3DSIH_NRM                   */ shader_glsl_nrm,
     /* WINED3DSIH_OR                    */ shader_glsl_binop,
     /* WINED3DSIH_PHASE                 */ shader_glsl_nop,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index f2c3e74..5730cef 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -118,6 +118,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_MUL                   */ "mul",
     /* WINED3DSIH_NE                    */ "ne",
     /* WINED3DSIH_NOP                   */ "nop",
+    /* WINED3DSIH_NOT                   */ "not",
     /* WINED3DSIH_NRM                   */ "nrm",
     /* WINED3DSIH_OR                    */ "or",
     /* WINED3DSIH_PHASE                 */ "phase",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index d800bc8..b6e3c1e 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -125,6 +125,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_MOVC                 = 0x37,
     WINED3D_SM4_OP_MUL                  = 0x38,
     WINED3D_SM4_OP_NE                   = 0x39,
+    WINED3D_SM4_OP_NOT                  = 0x3b,
     WINED3D_SM4_OP_OR                   = 0x3c,
     WINED3D_SM4_OP_RESINFO              = 0x3d,
     WINED3D_SM4_OP_RET                  = 0x3e,
@@ -306,6 +307,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_MOVC,                   WINED3DSIH_MOVC,                "F",    "UFF"},
     {WINED3D_SM4_OP_MUL,                    WINED3DSIH_MUL,                 "F",    "FF"},
     {WINED3D_SM4_OP_NE,                     WINED3DSIH_NE,                  "U",    "FF"},
+    {WINED3D_SM4_OP_NOT,                    WINED3DSIH_NOT,                 "U",    "U"},
     {WINED3D_SM4_OP_OR,                     WINED3DSIH_OR,                  "U",    "UU"},
     {WINED3D_SM4_OP_RESINFO,                WINED3DSIH_RESINFO,             "F",    "IR"},
     {WINED3D_SM4_OP_RET,                    WINED3DSIH_RET,                 "",     ""},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 191733a..5558c70 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -535,6 +535,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_MUL,
     WINED3DSIH_NE,
     WINED3DSIH_NOP,
+    WINED3DSIH_NOT,
     WINED3DSIH_NRM,
     WINED3DSIH_OR,
     WINED3DSIH_PHASE,