Commit 764c87d5 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Recognize SM4 not opcode.

parent 6004c261
...@@ -5290,6 +5290,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL ...@@ -5290,6 +5290,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_MUL */ shader_hw_map2gl, /* WINED3DSIH_MUL */ shader_hw_map2gl,
/* WINED3DSIH_NE */ NULL, /* WINED3DSIH_NE */ NULL,
/* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NOP */ shader_hw_nop,
/* WINED3DSIH_NOT */ NULL,
/* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_NRM */ shader_hw_nrm,
/* WINED3DSIH_OR */ NULL, /* WINED3DSIH_OR */ NULL,
/* WINED3DSIH_PHASE */ shader_hw_nop, /* WINED3DSIH_PHASE */ shader_hw_nop,
......
...@@ -8050,6 +8050,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB ...@@ -8050,6 +8050,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_MUL */ shader_glsl_binop, /* WINED3DSIH_MUL */ shader_glsl_binop,
/* WINED3DSIH_NE */ shader_glsl_relop, /* WINED3DSIH_NE */ shader_glsl_relop,
/* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NOP */ shader_glsl_nop,
/* WINED3DSIH_NOT */ NULL,
/* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_NRM */ shader_glsl_nrm,
/* WINED3DSIH_OR */ shader_glsl_binop, /* WINED3DSIH_OR */ shader_glsl_binop,
/* WINED3DSIH_PHASE */ shader_glsl_nop, /* WINED3DSIH_PHASE */ shader_glsl_nop,
......
...@@ -118,6 +118,7 @@ static const char * const shader_opcode_names[] = ...@@ -118,6 +118,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_MUL */ "mul", /* WINED3DSIH_MUL */ "mul",
/* WINED3DSIH_NE */ "ne", /* WINED3DSIH_NE */ "ne",
/* WINED3DSIH_NOP */ "nop", /* WINED3DSIH_NOP */ "nop",
/* WINED3DSIH_NOT */ "not",
/* WINED3DSIH_NRM */ "nrm", /* WINED3DSIH_NRM */ "nrm",
/* WINED3DSIH_OR */ "or", /* WINED3DSIH_OR */ "or",
/* WINED3DSIH_PHASE */ "phase", /* WINED3DSIH_PHASE */ "phase",
......
...@@ -125,6 +125,7 @@ enum wined3d_sm4_opcode ...@@ -125,6 +125,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_NOT = 0x3b,
WINED3D_SM4_OP_OR = 0x3c, WINED3D_SM4_OP_OR = 0x3c,
WINED3D_SM4_OP_RESINFO = 0x3d, WINED3D_SM4_OP_RESINFO = 0x3d,
WINED3D_SM4_OP_RET = 0x3e, WINED3D_SM4_OP_RET = 0x3e,
...@@ -306,6 +307,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = ...@@ -306,6 +307,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_NOT, WINED3DSIH_NOT, "U", "U"},
{WINED3D_SM4_OP_OR, WINED3DSIH_OR, "U", "UU"}, {WINED3D_SM4_OP_OR, WINED3DSIH_OR, "U", "UU"},
{WINED3D_SM4_OP_RESINFO, WINED3DSIH_RESINFO, "F", "IR"}, {WINED3D_SM4_OP_RESINFO, WINED3DSIH_RESINFO, "F", "IR"},
{WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""},
......
...@@ -535,6 +535,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER ...@@ -535,6 +535,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_MUL, WINED3DSIH_MUL,
WINED3DSIH_NE, WINED3DSIH_NE,
WINED3DSIH_NOP, WINED3DSIH_NOP,
WINED3DSIH_NOT,
WINED3DSIH_NRM, WINED3DSIH_NRM,
WINED3DSIH_OR, WINED3DSIH_OR,
WINED3DSIH_PHASE, WINED3DSIH_PHASE,
......
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