Commit af112145 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Recognize the SM4 eq opcode.

parent 49c35fca
...@@ -5053,6 +5053,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL ...@@ -5053,6 +5053,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_ENDIF */ shader_hw_endif, /* WINED3DSIH_ENDIF */ shader_hw_endif,
/* WINED3DSIH_ENDLOOP */ shader_hw_endloop, /* WINED3DSIH_ENDLOOP */ shader_hw_endloop,
/* WINED3DSIH_ENDREP */ shader_hw_endrep, /* WINED3DSIH_ENDREP */ shader_hw_endrep,
/* WINED3DSIH_EQ */ NULL,
/* WINED3DSIH_EXP */ shader_hw_scalar_op, /* WINED3DSIH_EXP */ shader_hw_scalar_op,
/* WINED3DSIH_EXPP */ shader_hw_scalar_op, /* WINED3DSIH_EXPP */ shader_hw_scalar_op,
/* WINED3DSIH_FRC */ shader_hw_map2gl, /* WINED3DSIH_FRC */ shader_hw_map2gl,
......
...@@ -5008,6 +5008,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB ...@@ -5008,6 +5008,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDIF */ shader_glsl_end,
/* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end,
/* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end,
/* WINED3DSIH_EQ */ NULL,
/* WINED3DSIH_EXP */ shader_glsl_map2gl, /* WINED3DSIH_EXP */ shader_glsl_map2gl,
/* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_EXPP */ shader_glsl_expp,
/* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FRC */ shader_glsl_map2gl,
......
...@@ -64,6 +64,7 @@ static const char * const shader_opcode_names[] = ...@@ -64,6 +64,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_ENDIF */ "endif", /* WINED3DSIH_ENDIF */ "endif",
/* WINED3DSIH_ENDLOOP */ "endloop", /* WINED3DSIH_ENDLOOP */ "endloop",
/* WINED3DSIH_ENDREP */ "endrep", /* WINED3DSIH_ENDREP */ "endrep",
/* WINED3DSIH_EQ */ "eq",
/* WINED3DSIH_EXP */ "exp", /* WINED3DSIH_EXP */ "exp",
/* WINED3DSIH_EXPP */ "expp", /* WINED3DSIH_EXPP */ "expp",
/* WINED3DSIH_FRC */ "frc", /* WINED3DSIH_FRC */ "frc",
......
...@@ -65,6 +65,7 @@ enum wined3d_sm4_opcode ...@@ -65,6 +65,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_EMIT = 0x13, WINED3D_SM4_OP_EMIT = 0x13,
WINED3D_SM4_OP_ENDIF = 0x15, WINED3D_SM4_OP_ENDIF = 0x15,
WINED3D_SM4_OP_ENDLOOP = 0x16, WINED3D_SM4_OP_ENDLOOP = 0x16,
WINED3D_SM4_OP_EQ = 0x18,
WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_EXP = 0x19,
WINED3D_SM4_OP_FRC = 0x1a, WINED3D_SM4_OP_FRC = 0x1a,
WINED3D_SM4_OP_FTOI = 0x1b, WINED3D_SM4_OP_FTOI = 0x1b,
...@@ -148,6 +149,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = ...@@ -148,6 +149,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, 0, 0}, {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, 0, 0},
{WINED3D_SM4_OP_ENDIF, WINED3DSIH_ENDIF, 0, 0}, {WINED3D_SM4_OP_ENDIF, WINED3DSIH_ENDIF, 0, 0},
{WINED3D_SM4_OP_ENDLOOP, WINED3DSIH_ENDLOOP, 0, 0}, {WINED3D_SM4_OP_ENDLOOP, WINED3DSIH_ENDLOOP, 0, 0},
{WINED3D_SM4_OP_EQ, WINED3DSIH_EQ, 1, 2},
{WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1},
{WINED3D_SM4_OP_FRC, WINED3DSIH_FRC, 1, 1}, {WINED3D_SM4_OP_FRC, WINED3DSIH_FRC, 1, 1},
{WINED3D_SM4_OP_FTOI, WINED3DSIH_FTOI, 1, 1}, {WINED3D_SM4_OP_FTOI, WINED3DSIH_FTOI, 1, 1},
......
...@@ -437,6 +437,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER ...@@ -437,6 +437,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_ENDIF, WINED3DSIH_ENDIF,
WINED3DSIH_ENDLOOP, WINED3DSIH_ENDLOOP,
WINED3DSIH_ENDREP, WINED3DSIH_ENDREP,
WINED3DSIH_EQ,
WINED3DSIH_EXP, WINED3DSIH_EXP,
WINED3DSIH_EXPP, WINED3DSIH_EXPP,
WINED3DSIH_FRC, WINED3DSIH_FRC,
......
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