Henri Verbeet : wined3d: Recognize the SM4 cut opcode.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Wed Jan  6 23:22:17 2010 +0100

wined3d: Recognize the SM4 cut opcode.

---

dlls/wined3d/arb_program_shader.c |    1 +
 dlls/wined3d/baseshader.c         |    1 +
 dlls/wined3d/glsl_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 cf7a429..48f0e41 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -4678,6 +4678,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_CMP           */ pshader_hw_cmp,
     /* WINED3DSIH_CND           */ pshader_hw_cnd,
     /* WINED3DSIH_CRS           */ shader_hw_map2gl,
+    /* WINED3DSIH_CUT           */ NULL,
     /* WINED3DSIH_DCL           */ NULL,
     /* WINED3DSIH_DEF           */ NULL,
     /* WINED3DSIH_DEFB          */ NULL,
diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index f0fe664..2ec6858 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
@@ -45,6 +45,7 @@ static const char *shader_opcode_names[] =
     /* WINED3DSIH_CMP           */ "cmp",
     /* WINED3DSIH_CND           */ "cnd",
     /* WINED3DSIH_CRS           */ "crs",
+    /* WINED3DSIH_CUT           */ "cut",
     /* WINED3DSIH_DCL           */ "dcl",
     /* WINED3DSIH_DEF           */ "def",
     /* WINED3DSIH_DEFB          */ "defb",
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 344a266..7392dc7 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -4720,6 +4720,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_CMP           */ shader_glsl_cmp,
     /* WINED3DSIH_CND           */ shader_glsl_cnd,
     /* WINED3DSIH_CRS           */ shader_glsl_cross,
+    /* WINED3DSIH_CUT           */ NULL,
     /* WINED3DSIH_DCL           */ NULL,
     /* WINED3DSIH_DEF           */ NULL,
     /* WINED3DSIH_DEFB          */ NULL,
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 1b23de2..e5b4609 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -51,6 +51,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_ADD      = 0x00,
     WINED3D_SM4_OP_BREAK    = 0x02,
     WINED3D_SM4_OP_BREAKC   = 0x03,
+    WINED3D_SM4_OP_CUT      = 0x09,
     WINED3D_SM4_OP_DP3      = 0x10,
     WINED3D_SM4_OP_DP4      = 0x11,
     WINED3D_SM4_OP_EMIT     = 0x13,
@@ -113,6 +114,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_ADD,    WINED3DSIH_ADD,         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},
     {WINED3D_SM4_OP_DP3,    WINED3DSIH_DP3,         1,  2},
     {WINED3D_SM4_OP_DP4,    WINED3DSIH_DP4,         1,  2},
     {WINED3D_SM4_OP_EMIT,   WINED3DSIH_EMIT,        0,  0},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index cba17b0..d501247 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -410,6 +410,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_CMP,
     WINED3DSIH_CND,
     WINED3DSIH_CRS,
+    WINED3DSIH_CUT,
     WINED3DSIH_DCL,
     WINED3DSIH_DEF,
     WINED3DSIH_DEFB,