Henri Verbeet : wined3d: Recognize the SM4 and opcode.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Oct  7 12:17:57 2010 +0200

wined3d: Recognize the SM4 and opcode.

---

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(+), 0 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index dec7a10..52b055b 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -4933,6 +4933,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
 {
     /* WINED3DSIH_ABS           */ shader_hw_map2gl,
     /* WINED3DSIH_ADD           */ shader_hw_map2gl,
+    /* WINED3DSIH_AND           */ NULL,
     /* WINED3DSIH_BEM           */ pshader_hw_bem,
     /* WINED3DSIH_BREAK         */ shader_hw_break,
     /* WINED3DSIH_BREAKC        */ shader_hw_breakc,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index b71a17e..fb6e2cb 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -4991,6 +4991,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
 {
     /* WINED3DSIH_ABS           */ shader_glsl_map2gl,
     /* WINED3DSIH_ADD           */ shader_glsl_arith,
+    /* WINED3DSIH_AND           */ NULL,
     /* WINED3DSIH_BEM           */ shader_glsl_bem,
     /* WINED3DSIH_BREAK         */ shader_glsl_break,
     /* WINED3DSIH_BREAKC        */ shader_glsl_breakc,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 323f010..ebb7d5c 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -37,6 +37,7 @@ static const char * const shader_opcode_names[] =
 {
     /* WINED3DSIH_ABS           */ "abs",
     /* WINED3DSIH_ADD           */ "add",
+    /* WINED3DSIH_AND           */ "and",
     /* WINED3DSIH_BEM           */ "bem",
     /* WINED3DSIH_BREAK         */ "break",
     /* WINED3DSIH_BREAKC        */ "breakc",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 3ba10bf..fc2ba62 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
 enum wined3d_sm4_opcode
 {
     WINED3D_SM4_OP_ADD      = 0x00,
+    WINED3D_SM4_OP_AND      = 0x01,
     WINED3D_SM4_OP_BREAK    = 0x02,
     WINED3D_SM4_OP_BREAKC   = 0x03,
     WINED3D_SM4_OP_CUT      = 0x09,
@@ -113,6 +114,7 @@ struct sysval_map
 static const struct wined3d_sm4_opcode_info opcode_table[] =
 {
     {WINED3D_SM4_OP_ADD,    WINED3DSIH_ADD,         1,  2},
+    {WINED3D_SM4_OP_AND,    WINED3DSIH_AND,         1,  2},
     {WINED3D_SM4_OP_BREAK,  WINED3DSIH_BREAK,       0,  0},
     {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP,      0,  1},
     {WINED3D_SM4_OP_CUT,    WINED3DSIH_CUT,         0,  0},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index dc5d144..47d8b8b 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -404,6 +404,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
 {
     WINED3DSIH_ABS,
     WINED3DSIH_ADD,
+    WINED3DSIH_AND,
     WINED3DSIH_BEM,
     WINED3DSIH_BREAK,
     WINED3DSIH_BREAKC,