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

wined3d: Recognize SM4 round_z opcode. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2016-01-27 23:43:42 +01:00 committed by Alexandre Julliard
parent 3bad663d97
commit dd4c1ccd9e
5 changed files with 6 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

@ -5301,6 +5301,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_RET */ shader_hw_ret,
/* WINED3DSIH_ROUND_NI */ NULL, /* WINED3DSIH_ROUND_NI */ NULL,
/* WINED3DSIH_ROUND_PI */ NULL, /* WINED3DSIH_ROUND_PI */ NULL,
/* WINED3DSIH_ROUND_Z */ NULL,
/* WINED3DSIH_RSQ */ shader_hw_scalar_op, /* WINED3DSIH_RSQ */ shader_hw_scalar_op,
/* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SAMPLE */ NULL,
/* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL,

1
dlls/wined3d/glsl_shader.c
View File

@ -8075,6 +8075,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_RET */ shader_glsl_ret,
/* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl,
/* WINED3DSIH_ROUND_PI */ NULL, /* WINED3DSIH_ROUND_PI */ NULL,
/* WINED3DSIH_ROUND_Z */ NULL,
/* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_RSQ */ shader_glsl_scalar_op,
/* WINED3DSIH_SAMPLE */ shader_glsl_sample, /* WINED3DSIH_SAMPLE */ shader_glsl_sample,
/* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL,

1
dlls/wined3d/shader.c
View File

@ -129,6 +129,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_RET */ "ret", /* WINED3DSIH_RET */ "ret",
/* WINED3DSIH_ROUND_NI */ "round_ni", /* WINED3DSIH_ROUND_NI */ "round_ni",
/* WINED3DSIH_ROUND_PI */ "round_pi", /* WINED3DSIH_ROUND_PI */ "round_pi",
/* WINED3DSIH_ROUND_Z */ "round_z",
/* WINED3DSIH_RSQ */ "rsq", /* WINED3DSIH_RSQ */ "rsq",
/* WINED3DSIH_SAMPLE */ "sample", /* WINED3DSIH_SAMPLE */ "sample",
/* WINED3DSIH_SAMPLE_GRAD */ "sample_d", /* WINED3DSIH_SAMPLE_GRAD */ "sample_d",

2
dlls/wined3d/shader_sm4.c
View File

@ -131,6 +131,7 @@ enum wined3d_sm4_opcode
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_ROUND_PI = 0x42, WINED3D_SM4_OP_ROUND_PI = 0x42,
WINED3D_SM4_OP_ROUND_Z = 0x43,
WINED3D_SM4_OP_RSQ = 0x44, WINED3D_SM4_OP_RSQ = 0x44,
WINED3D_SM4_OP_SAMPLE = 0x45, WINED3D_SM4_OP_SAMPLE = 0x45,
WINED3D_SM4_OP_SAMPLE_LOD = 0x48, WINED3D_SM4_OP_SAMPLE_LOD = 0x48,
@ -314,6 +315,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{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_ROUND_PI, WINED3DSIH_ROUND_PI, "F", "F"}, {WINED3D_SM4_OP_ROUND_PI, WINED3DSIH_ROUND_PI, "F", "F"},
{WINED3D_SM4_OP_ROUND_Z, WINED3DSIH_ROUND_Z, "F", "F"},
{WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"},
{WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, "U", "FRS"}, {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, "U", "FRS"},
{WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, "U", "FRSF"}, {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, "U", "FRSF"},

1
dlls/wined3d/wined3d_private.h
View File

@ -557,6 +557,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_RET, WINED3DSIH_RET,
WINED3DSIH_ROUND_NI, WINED3DSIH_ROUND_NI,
WINED3DSIH_ROUND_PI, WINED3DSIH_ROUND_PI,
WINED3DSIH_ROUND_Z,
WINED3DSIH_RSQ, WINED3DSIH_RSQ,
WINED3DSIH_SAMPLE, WINED3DSIH_SAMPLE,
WINED3DSIH_SAMPLE_GRAD, WINED3DSIH_SAMPLE_GRAD,