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

wined3d: Implement SM4 continue instruction. 

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-07-05 11:46:53 +02:00 committed by Alexandre Julliard
parent eab16f1310
commit 57732599e5
5 changed files with 11 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

@ -5224,6 +5224,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_CASE */ NULL,
/* WINED3DSIH_CMP */ pshader_hw_cmp,
/* WINED3DSIH_CND */ pshader_hw_cnd,
/* WINED3DSIH_CONTINUE */ NULL,
/* WINED3DSIH_CRS */ shader_hw_map2gl,
/* WINED3DSIH_CUT */ NULL,
/* WINED3DSIH_CUT_STREAM */ NULL,

6
dlls/wined3d/glsl_shader.c
View File

@ -4330,6 +4330,11 @@ static void shader_glsl_breakp(const struct wined3d_shader_instruction *ins)
shader_addline(ins->ctx->buffer, "if (%s(%s)) break;\n", condition, src_param.param_str);
}
static void shader_glsl_continue(const struct wined3d_shader_instruction *ins)
{
shader_addline(ins->ctx->buffer, "continue;\n");
}
static void shader_glsl_label(const struct wined3d_shader_instruction *ins)
{
shader_addline(ins->ctx->buffer, "}\n");
@ -8576,6 +8581,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_CASE */ shader_glsl_case,
/* WINED3DSIH_CMP */ shader_glsl_conditional_move,
/* WINED3DSIH_CND */ shader_glsl_cnd,
/* WINED3DSIH_CONTINUE */ shader_glsl_continue,
/* WINED3DSIH_CRS */ shader_glsl_cross,
/* WINED3DSIH_CUT */ shader_glsl_cut,
/* WINED3DSIH_CUT_STREAM */ NULL,

1
dlls/wined3d/shader.c
View File

@ -54,6 +54,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_CASE */ "case",
/* WINED3DSIH_CMP */ "cmp",
/* WINED3DSIH_CND */ "cnd",
/* WINED3DSIH_CONTINUE */ "continue",
/* WINED3DSIH_CRS */ "crs",
/* WINED3DSIH_CUT */ "cut",
/* WINED3DSIH_CUT_STREAM */ "cut_stream",

2
dlls/wined3d/shader_sm4.c
View File

@ -112,6 +112,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_BREAK = 0x02,
WINED3D_SM4_OP_BREAKC = 0x03,
WINED3D_SM4_OP_CASE = 0x06,
WINED3D_SM4_OP_CONTINUE = 0x07,
WINED3D_SM4_OP_CUT = 0x09,
WINED3D_SM4_OP_DEFAULT = 0x0a,
WINED3D_SM4_OP_DERIV_RTX = 0x0b,
@ -687,6 +688,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, "", "u",
shader_sm4_read_conditional_op},
{WINED3D_SM4_OP_CASE, WINED3DSIH_CASE, "", "u"},
{WINED3D_SM4_OP_CONTINUE, WINED3DSIH_CONTINUE, "", ""},
{WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, "", ""},
{WINED3D_SM4_OP_DEFAULT, WINED3DSIH_DEFAULT, "", ""},
{WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "f", "f"},

1
dlls/wined3d/wined3d_private.h
View File

@ -570,6 +570,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_CASE,
WINED3DSIH_CMP,
WINED3DSIH_CND,
WINED3DSIH_CONTINUE,
WINED3DSIH_CRS,
WINED3DSIH_CUT,
WINED3DSIH_CUT_STREAM,