Commit 46cefd31 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Recognize the SM4 cut opcode.

parent 449e5219
...@@ -4678,6 +4678,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL ...@@ -4678,6 +4678,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_CMP */ pshader_hw_cmp, /* WINED3DSIH_CMP */ pshader_hw_cmp,
/* WINED3DSIH_CND */ pshader_hw_cnd, /* WINED3DSIH_CND */ pshader_hw_cnd,
/* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CRS */ shader_hw_map2gl,
/* WINED3DSIH_CUT */ NULL,
/* WINED3DSIH_DCL */ NULL, /* WINED3DSIH_DCL */ NULL,
/* WINED3DSIH_DEF */ NULL, /* WINED3DSIH_DEF */ NULL,
/* WINED3DSIH_DEFB */ NULL, /* WINED3DSIH_DEFB */ NULL,
......
...@@ -45,6 +45,7 @@ static const char *shader_opcode_names[] = ...@@ -45,6 +45,7 @@ static const char *shader_opcode_names[] =
/* WINED3DSIH_CMP */ "cmp", /* WINED3DSIH_CMP */ "cmp",
/* WINED3DSIH_CND */ "cnd", /* WINED3DSIH_CND */ "cnd",
/* WINED3DSIH_CRS */ "crs", /* WINED3DSIH_CRS */ "crs",
/* WINED3DSIH_CUT */ "cut",
/* WINED3DSIH_DCL */ "dcl", /* WINED3DSIH_DCL */ "dcl",
/* WINED3DSIH_DEF */ "def", /* WINED3DSIH_DEF */ "def",
/* WINED3DSIH_DEFB */ "defb", /* WINED3DSIH_DEFB */ "defb",
......
...@@ -4720,6 +4720,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB ...@@ -4720,6 +4720,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_CMP */ shader_glsl_cmp, /* WINED3DSIH_CMP */ shader_glsl_cmp,
/* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CND */ shader_glsl_cnd,
/* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CRS */ shader_glsl_cross,
/* WINED3DSIH_CUT */ NULL,
/* WINED3DSIH_DCL */ NULL, /* WINED3DSIH_DCL */ NULL,
/* WINED3DSIH_DEF */ NULL, /* WINED3DSIH_DEF */ NULL,
/* WINED3DSIH_DEFB */ NULL, /* WINED3DSIH_DEFB */ NULL,
......
...@@ -51,6 +51,7 @@ enum wined3d_sm4_opcode ...@@ -51,6 +51,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_ADD = 0x00, WINED3D_SM4_OP_ADD = 0x00,
WINED3D_SM4_OP_BREAK = 0x02, WINED3D_SM4_OP_BREAK = 0x02,
WINED3D_SM4_OP_BREAKC = 0x03, WINED3D_SM4_OP_BREAKC = 0x03,
WINED3D_SM4_OP_CUT = 0x09,
WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP3 = 0x10,
WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_DP4 = 0x11,
WINED3D_SM4_OP_EMIT = 0x13, WINED3D_SM4_OP_EMIT = 0x13,
...@@ -113,6 +114,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = ...@@ -113,6 +114,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2}, {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2},
{WINED3D_SM4_OP_BREAK, WINED3DSIH_BREAK, 0, 0}, {WINED3D_SM4_OP_BREAK, WINED3DSIH_BREAK, 0, 0},
{WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, 0, 1}, {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_DP3, WINED3DSIH_DP3, 1, 2},
{WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2},
{WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, 0, 0}, {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, 0, 0},
......
...@@ -410,6 +410,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER ...@@ -410,6 +410,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_CMP, WINED3DSIH_CMP,
WINED3DSIH_CND, WINED3DSIH_CND,
WINED3DSIH_CRS, WINED3DSIH_CRS,
WINED3DSIH_CUT,
WINED3DSIH_DCL, WINED3DSIH_DCL,
WINED3DSIH_DEF, WINED3DSIH_DEF,
WINED3DSIH_DEFB, WINED3DSIH_DEFB,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment