ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Recognize the SM4 or opcode.

This commit is contained in:
Henri Verbeet 2015-02-11 14:10:18 +01:00 committed by Alexandre Julliard
parent 3225fea30c
commit e4cb3b5081
5 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/wined3d/arb_program_shader.c
View File

@ -5241,6 +5241,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_NE */ NULL, /* WINED3DSIH_NE */ NULL,
/* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NOP */ shader_hw_nop,
/* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_NRM */ shader_hw_nrm,
/* WINED3DSIH_OR */ NULL,
/* WINED3DSIH_PHASE */ shader_hw_nop, /* WINED3DSIH_PHASE */ shader_hw_nop,
/* WINED3DSIH_POW */ shader_hw_pow, /* WINED3DSIH_POW */ shader_hw_pow,
/* WINED3DSIH_RCP */ shader_hw_scalar_op, /* WINED3DSIH_RCP */ shader_hw_scalar_op,

2
dlls/wined3d/glsl_shader.c
View File

@ -2319,6 +2319,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins)
case WINED3DSIH_IADD: op = "+"; break; case WINED3DSIH_IADD: op = "+"; break;
case WINED3DSIH_ISHL: op = "<<"; break; case WINED3DSIH_ISHL: op = "<<"; break;
case WINED3DSIH_MUL: op = "*"; break; case WINED3DSIH_MUL: op = "*"; break;
case WINED3DSIH_OR: op = "|"; break;
case WINED3DSIH_SUB: op = "-"; break; case WINED3DSIH_SUB: op = "-"; break;
case WINED3DSIH_USHR: op = ">>"; break; case WINED3DSIH_USHR: op = ">>"; break;
case WINED3DSIH_XOR: op = "^"; break; case WINED3DSIH_XOR: op = "^"; break;
@ -6777,6 +6778,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_NE */ shader_glsl_relop, /* WINED3DSIH_NE */ shader_glsl_relop,
/* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NOP */ shader_glsl_nop,
/* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_NRM */ shader_glsl_nrm,
/* WINED3DSIH_OR */ shader_glsl_binop,
/* WINED3DSIH_PHASE */ shader_glsl_nop, /* WINED3DSIH_PHASE */ shader_glsl_nop,
/* WINED3DSIH_POW */ shader_glsl_pow, /* WINED3DSIH_POW */ shader_glsl_pow,
/* WINED3DSIH_RCP */ shader_glsl_scalar_op, /* WINED3DSIH_RCP */ shader_glsl_scalar_op,

1
dlls/wined3d/shader.c
View File

@ -111,6 +111,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_NE */ "ne", /* WINED3DSIH_NE */ "ne",
/* WINED3DSIH_NOP */ "nop", /* WINED3DSIH_NOP */ "nop",
/* WINED3DSIH_NRM */ "nrm", /* WINED3DSIH_NRM */ "nrm",
/* WINED3DSIH_OR */ "or",
/* WINED3DSIH_PHASE */ "phase", /* WINED3DSIH_PHASE */ "phase",
/* WINED3DSIH_POW */ "pow", /* WINED3DSIH_POW */ "pow",
/* WINED3DSIH_RCP */ "rcp", /* WINED3DSIH_RCP */ "rcp",

2
dlls/wined3d/shader_sm4.c
View File

@ -112,6 +112,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_MOVC = 0x37, WINED3D_SM4_OP_MOVC = 0x37,
WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_MUL = 0x38,
WINED3D_SM4_OP_NE = 0x39, WINED3D_SM4_OP_NE = 0x39,
WINED3D_SM4_OP_OR = 0x3c,
WINED3D_SM4_OP_RET = 0x3e, WINED3D_SM4_OP_RET = 0x3e,
WINED3D_SM4_OP_ROUND_NI = 0x41, WINED3D_SM4_OP_ROUND_NI = 0x41,
WINED3D_SM4_OP_RSQ = 0x44, WINED3D_SM4_OP_RSQ = 0x44,
@ -280,6 +281,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, "F", "UFF"}, {WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, "F", "UFF"},
{WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, "F", "FF"}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, "F", "FF"},
{WINED3D_SM4_OP_NE, WINED3DSIH_NE, "U", "FF"}, {WINED3D_SM4_OP_NE, WINED3DSIH_NE, "U", "FF"},
{WINED3D_SM4_OP_OR, WINED3DSIH_OR, "U", "UU"},
{WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""},
{WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, "F", "F"}, {WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, "F", "F"},
{WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"},

1
dlls/wined3d/wined3d_private.h
View File

@ -514,6 +514,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_NE, WINED3DSIH_NE,
WINED3DSIH_NOP, WINED3DSIH_NOP,
WINED3DSIH_NRM, WINED3DSIH_NRM,
WINED3DSIH_OR,
WINED3DSIH_PHASE, WINED3DSIH_PHASE,
WINED3DSIH_POW, WINED3DSIH_POW,
WINED3DSIH_RCP, WINED3DSIH_RCP,