Commit 4a5146a7 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Implement SM4 umin instruction.

parent dee9d140
......@@ -5397,6 +5397,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_UGE */ NULL,
/* WINED3DSIH_ULT */ NULL,
/* WINED3DSIH_UMAX */ NULL,
/* WINED3DSIH_UMIN */ NULL,
/* WINED3DSIH_USHR */ NULL,
/* WINED3DSIH_UTOF */ NULL,
/* WINED3DSIH_XOR */ NULL,
......
......@@ -3538,6 +3538,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins)
case WINED3DSIH_ROUND_Z: instruction = "trunc"; break;
case WINED3DSIH_SQRT: instruction = "sqrt"; break;
case WINED3DSIH_UMAX: instruction = "max"; break;
case WINED3DSIH_UMIN: instruction = "min"; break;
default: instruction = "";
FIXME("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx));
break;
......@@ -8814,6 +8815,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_UGE */ shader_glsl_relop,
/* WINED3DSIH_ULT */ shader_glsl_relop,
/* WINED3DSIH_UMAX */ shader_glsl_map2gl,
/* WINED3DSIH_UMIN */ shader_glsl_map2gl,
/* WINED3DSIH_USHR */ shader_glsl_binop,
/* WINED3DSIH_UTOF */ shader_glsl_to_float,
/* WINED3DSIH_XOR */ shader_glsl_binop,
......
......@@ -227,6 +227,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_UGE */ "uge",
/* WINED3DSIH_ULT */ "ult",
/* WINED3DSIH_UMAX */ "umax",
/* WINED3DSIH_UMIN */ "umin",
/* WINED3DSIH_USHR */ "ushr",
/* WINED3DSIH_UTOF */ "utof",
/* WINED3DSIH_XOR */ "xor",
......
......@@ -182,6 +182,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_ULT = 0x4f,
WINED3D_SM4_OP_UGE = 0x50,
WINED3D_SM4_OP_UMAX = 0x53,
WINED3D_SM4_OP_UMIN = 0x54,
WINED3D_SM4_OP_USHR = 0x55,
WINED3D_SM4_OP_UTOF = 0x56,
WINED3D_SM4_OP_XOR = 0x57,
......@@ -762,6 +763,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM4_OP_ULT, WINED3DSIH_ULT, "u", "uu"},
{WINED3D_SM4_OP_UGE, WINED3DSIH_UGE, "u", "uu"},
{WINED3D_SM4_OP_UMAX, WINED3DSIH_UMAX, "u", "uu"},
{WINED3D_SM4_OP_UMIN, WINED3DSIH_UMIN, "u", "uu"},
{WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "u", "uu"},
{WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "f", "u"},
{WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "u", "uu"},
......
......@@ -743,6 +743,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_UGE,
WINED3DSIH_ULT,
WINED3DSIH_UMAX,
WINED3DSIH_UMIN,
WINED3DSIH_USHR,
WINED3DSIH_UTOF,
WINED3DSIH_XOR,
......
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