Commit 05cf63b3 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Recognize SM4 imax opcode.

parent 32d73eab
...@@ -5257,6 +5257,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL ...@@ -5257,6 +5257,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */,
/* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IFC */ shader_hw_ifc,
/* WINED3DSIH_IGE */ NULL, /* WINED3DSIH_IGE */ NULL,
/* WINED3DSIH_IMAX */ NULL,
/* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_IMUL */ NULL,
/* WINED3DSIH_ISHL */ NULL, /* WINED3DSIH_ISHL */ NULL,
/* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_ITOF */ NULL,
......
...@@ -7857,6 +7857,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB ...@@ -7857,6 +7857,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IF */ shader_glsl_if,
/* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IFC */ shader_glsl_ifc,
/* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_IGE */ shader_glsl_relop,
/* WINED3DSIH_IMAX */ NULL,
/* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_IMUL */ shader_glsl_imul,
/* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ISHL */ shader_glsl_binop,
/* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_ITOF */ shader_glsl_to_float,
......
...@@ -85,6 +85,7 @@ static const char * const shader_opcode_names[] = ...@@ -85,6 +85,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_IF */ "if", /* WINED3DSIH_IF */ "if",
/* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IFC */ "ifc",
/* WINED3DSIH_IGE */ "ige", /* WINED3DSIH_IGE */ "ige",
/* WINED3DSIH_IMAX */ "imax",
/* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_IMUL */ "imul",
/* WINED3DSIH_ISHL */ "ishl", /* WINED3DSIH_ISHL */ "ishl",
/* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_ITOF */ "itof",
......
...@@ -98,6 +98,7 @@ enum wined3d_sm4_opcode ...@@ -98,6 +98,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_IF = 0x1f, WINED3D_SM4_OP_IF = 0x1f,
WINED3D_SM4_OP_IEQ = 0x20, WINED3D_SM4_OP_IEQ = 0x20,
WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_IGE = 0x21,
WINED3D_SM4_OP_IMAX = 0x24,
WINED3D_SM4_OP_IMUL = 0x26, WINED3D_SM4_OP_IMUL = 0x26,
WINED3D_SM4_OP_ISHL = 0x29, WINED3D_SM4_OP_ISHL = 0x29,
WINED3D_SM4_OP_ITOF = 0x2b, WINED3D_SM4_OP_ITOF = 0x2b,
...@@ -267,6 +268,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = ...@@ -267,6 +268,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM4_OP_IF, WINED3DSIH_IF, "", "U"}, {WINED3D_SM4_OP_IF, WINED3DSIH_IF, "", "U"},
{WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"},
{WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"},
{WINED3D_SM4_OP_IMAX, WINED3DSIH_IMAX, "I", "II"},
{WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"},
{WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"}, {WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"},
{WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"},
......
...@@ -500,6 +500,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER ...@@ -500,6 +500,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_IF, WINED3DSIH_IF,
WINED3DSIH_IFC, WINED3DSIH_IFC,
WINED3DSIH_IGE, WINED3DSIH_IGE,
WINED3DSIH_IMAX,
WINED3DSIH_IMUL, WINED3DSIH_IMUL,
WINED3DSIH_ISHL, WINED3DSIH_ISHL,
WINED3DSIH_ITOF, WINED3DSIH_ITOF,
......
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