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

wined3d: Recognize the SM4 ne opcode.

This commit is contained in:
Henri Verbeet 2015-02-11 14:10:17 +01:00 committed by Alexandre Julliard
parent 8506da62e0
commit 3225fea30c
5 changed files with 8 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

@ -5238,6 +5238,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_MOVA */ shader_hw_mov, /* WINED3DSIH_MOVA */ shader_hw_mov,
/* WINED3DSIH_MOVC */ NULL, /* WINED3DSIH_MOVC */ NULL,
/* WINED3DSIH_MUL */ shader_hw_map2gl, /* WINED3DSIH_MUL */ shader_hw_map2gl,
/* WINED3DSIH_NE */ NULL,
/* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NOP */ shader_hw_nop,
/* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_NRM */ shader_hw_nrm,
/* WINED3DSIH_PHASE */ shader_hw_nop, /* WINED3DSIH_PHASE */ shader_hw_nop,

3
dlls/wined3d/glsl_shader.c
View File

@ -2357,6 +2357,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins)
case WINED3DSIH_IGE: op = "greaterThanEqual"; break; case WINED3DSIH_IGE: op = "greaterThanEqual"; break;
case WINED3DSIH_UGE: op = "greaterThanEqual"; break; case WINED3DSIH_UGE: op = "greaterThanEqual"; break;
case WINED3DSIH_LT: op = "lessThan"; break; case WINED3DSIH_LT: op = "lessThan"; break;
case WINED3DSIH_NE: op = "notEqual"; break;
default: default:
op = "<unhandled operator>"; op = "<unhandled operator>";
ERR("Unhandled opcode %#x.\n", ins->handler_idx); ERR("Unhandled opcode %#x.\n", ins->handler_idx);
@ -2375,6 +2376,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins)
case WINED3DSIH_IGE: op = ">="; break; case WINED3DSIH_IGE: op = ">="; break;
case WINED3DSIH_UGE: op = ">="; break; case WINED3DSIH_UGE: op = ">="; break;
case WINED3DSIH_LT: op = "<"; break; case WINED3DSIH_LT: op = "<"; break;
case WINED3DSIH_NE: op = "!="; break;
default: default:
op = "<unhandled operator>"; op = "<unhandled operator>";
ERR("Unhandled opcode %#x.\n", ins->handler_idx); ERR("Unhandled opcode %#x.\n", ins->handler_idx);
@ -6772,6 +6774,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_MOVA */ shader_glsl_mov, /* WINED3DSIH_MOVA */ shader_glsl_mov,
/* WINED3DSIH_MOVC */ shader_glsl_conditional_move, /* WINED3DSIH_MOVC */ shader_glsl_conditional_move,
/* WINED3DSIH_MUL */ shader_glsl_binop, /* WINED3DSIH_MUL */ shader_glsl_binop,
/* 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_PHASE */ shader_glsl_nop, /* WINED3DSIH_PHASE */ shader_glsl_nop,

1
dlls/wined3d/shader.c
View File

@ -108,6 +108,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_MOVA */ "mova", /* WINED3DSIH_MOVA */ "mova",
/* WINED3DSIH_MOVC */ "movc", /* WINED3DSIH_MOVC */ "movc",
/* WINED3DSIH_MUL */ "mul", /* WINED3DSIH_MUL */ "mul",
/* WINED3DSIH_NE */ "ne",
/* WINED3DSIH_NOP */ "nop", /* WINED3DSIH_NOP */ "nop",
/* WINED3DSIH_NRM */ "nrm", /* WINED3DSIH_NRM */ "nrm",
/* WINED3DSIH_PHASE */ "phase", /* WINED3DSIH_PHASE */ "phase",

2
dlls/wined3d/shader_sm4.c
View File

@ -111,6 +111,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MOV = 0x36,
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_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,
@ -278,6 +279,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, "F", "F"}, {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, "F", "F"},
{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_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

@ -511,6 +511,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_MOVA, WINED3DSIH_MOVA,
WINED3DSIH_MOVC, WINED3DSIH_MOVC,
WINED3DSIH_MUL, WINED3DSIH_MUL,
WINED3DSIH_NE,
WINED3DSIH_NOP, WINED3DSIH_NOP,
WINED3DSIH_NRM, WINED3DSIH_NRM,
WINED3DSIH_PHASE, WINED3DSIH_PHASE,