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

wined3d: Recognize SM5 ld_structured 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-03-17 11:47:10 +01:00 committed by Alexandre Julliard
parent 0eba20def8
commit f0de33ba14
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

@ -5281,6 +5281,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_ITOF */ NULL,
/* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LABEL */ shader_hw_label,
/* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LD */ NULL,
/* WINED3DSIH_LD_STRUCTURED */ NULL,
/* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LIT */ shader_hw_map2gl,
/* WINED3DSIH_LOG */ shader_hw_scalar_op, /* WINED3DSIH_LOG */ shader_hw_scalar_op,
/* WINED3DSIH_LOGP */ shader_hw_scalar_op, /* WINED3DSIH_LOGP */ shader_hw_scalar_op,

1
dlls/wined3d/glsl_shader.c
View File

@ -8123,6 +8123,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_ITOF */ shader_glsl_to_float,
/* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LABEL */ shader_glsl_label,
/* WINED3DSIH_LD */ shader_glsl_ld, /* WINED3DSIH_LD */ shader_glsl_ld,
/* WINED3DSIH_LD_STRUCTURED */ NULL,
/* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LIT */ shader_glsl_lit,
/* WINED3DSIH_LOG */ shader_glsl_scalar_op, /* WINED3DSIH_LOG */ shader_glsl_scalar_op,
/* WINED3DSIH_LOGP */ shader_glsl_scalar_op, /* WINED3DSIH_LOGP */ shader_glsl_scalar_op,

1
dlls/wined3d/shader.c
View File

@ -109,6 +109,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_ITOF */ "itof",
/* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LABEL */ "label",
/* WINED3DSIH_LD */ "ld", /* WINED3DSIH_LD */ "ld",
/* WINED3DSIH_LD_STRUCTURED */ "ld_structured",
/* WINED3DSIH_LIT */ "lit", /* WINED3DSIH_LIT */ "lit",
/* WINED3DSIH_LOG */ "log", /* WINED3DSIH_LOG */ "log",
/* WINED3DSIH_LOGP */ "logp", /* WINED3DSIH_LOGP */ "logp",

2
dlls/wined3d/shader_sm4.c
View File

@ -183,6 +183,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, WINED3D_SM4_OP_DCL_OUTPUT_SIV = 0x67,
WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_TEMPS = 0x68,
WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a,
WINED3D_SM5_OP_LD_STRUCTURED = 0xa7,
}; };
enum wined3d_sm4_register_type enum wined3d_sm4_register_type
@ -384,6 +385,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM4_OP_DCL_OUTPUT_SIV, WINED3DSIH_DCL_OUTPUT_SIV, "", ""}, {WINED3D_SM4_OP_DCL_OUTPUT_SIV, WINED3DSIH_DCL_OUTPUT_SIV, "", ""},
{WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""},
{WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""},
{WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "U", "UUR"},
}; };
static const enum wined3d_shader_register_type register_type_table[] = static const enum wined3d_shader_register_type register_type_table[] =

1
dlls/wined3d/wined3d_private.h
View File

@ -561,6 +561,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_ITOF, WINED3DSIH_ITOF,
WINED3DSIH_LABEL, WINED3DSIH_LABEL,
WINED3DSIH_LD, WINED3DSIH_LD,
WINED3DSIH_LD_STRUCTURED,
WINED3DSIH_LIT, WINED3DSIH_LIT,
WINED3DSIH_LOG, WINED3DSIH_LOG,
WINED3DSIH_LOGP, WINED3DSIH_LOGP,