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

wined3d: Recognize SM5 emit_stream 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-07-04 12:26:28 +02:00 committed by Alexandre Julliard
parent 9a2a737807
commit 5c5a8256e8
5 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/wined3d/arb_program_shader.c
View File

@ -5274,6 +5274,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_DSY_FINE */ NULL, /* WINED3DSIH_DSY_FINE */ NULL,
/* WINED3DSIH_ELSE */ shader_hw_else, /* WINED3DSIH_ELSE */ shader_hw_else,
/* WINED3DSIH_EMIT */ NULL, /* WINED3DSIH_EMIT */ NULL,
/* WINED3DSIH_EMIT_STREAM */ NULL,
/* WINED3DSIH_ENDIF */ shader_hw_endif, /* WINED3DSIH_ENDIF */ shader_hw_endif,
/* WINED3DSIH_ENDLOOP */ shader_hw_endloop, /* WINED3DSIH_ENDLOOP */ shader_hw_endloop,
/* WINED3DSIH_ENDREP */ shader_hw_endrep, /* WINED3DSIH_ENDREP */ shader_hw_endrep,

1
dlls/wined3d/glsl_shader.c
View File

@ -8610,6 +8610,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_DSY_FINE */ NULL, /* WINED3DSIH_DSY_FINE */ NULL,
/* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_ELSE */ shader_glsl_else,
/* WINED3DSIH_EMIT */ shader_glsl_emit, /* WINED3DSIH_EMIT */ shader_glsl_emit,
/* WINED3DSIH_EMIT_STREAM */ NULL,
/* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDIF */ shader_glsl_end,
/* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end,
/* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end,

5
dlls/wined3d/shader.c
View File

@ -104,6 +104,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_DSY_FINE */ "deriv_rty_fine", /* WINED3DSIH_DSY_FINE */ "deriv_rty_fine",
/* WINED3DSIH_ELSE */ "else", /* WINED3DSIH_ELSE */ "else",
/* WINED3DSIH_EMIT */ "emit", /* WINED3DSIH_EMIT */ "emit",
/* WINED3DSIH_EMIT_STREAM */ "emit_stream",
/* WINED3DSIH_ENDIF */ "endif", /* WINED3DSIH_ENDIF */ "endif",
/* WINED3DSIH_ENDLOOP */ "endloop", /* WINED3DSIH_ENDLOOP */ "endloop",
/* WINED3DSIH_ENDREP */ "endrep", /* WINED3DSIH_ENDREP */ "endrep",
@ -1779,6 +1780,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer,
shader_addline(buffer, "x"); shader_addline(buffer, "x");
break; break;
case WINED3DSPR_STREAM:
shader_addline(buffer, "m");
break;
default: default:
shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type);
break; break;

29
dlls/wined3d/shader_sm4.c
View File

@ -206,6 +206,7 @@ enum wined3d_sm4_opcode
WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72,
WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, WINED3D_SM5_OP_HS_FORK_PHASE = 0x73,
WINED3D_SM5_OP_HS_JOIN_PHASE = 0x74, WINED3D_SM5_OP_HS_JOIN_PHASE = 0x74,
WINED3D_SM5_OP_EMIT_STREAM = 0x75,
WINED3D_SM5_OP_BUFINFO = 0x79, WINED3D_SM5_OP_BUFINFO = 0x79,
WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a,
WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b,
@ -237,18 +238,19 @@ enum wined3d_sm4_opcode
enum wined3d_sm4_register_type enum wined3d_sm4_register_type
{ {
WINED3D_SM4_RT_TEMP = 0x0, WINED3D_SM4_RT_TEMP = 0x00,
WINED3D_SM4_RT_INPUT = 0x1, WINED3D_SM4_RT_INPUT = 0x01,
WINED3D_SM4_RT_OUTPUT = 0x2, WINED3D_SM4_RT_OUTPUT = 0x02,
WINED3D_SM4_RT_INDEXABLE_TEMP = 0x3, WINED3D_SM4_RT_INDEXABLE_TEMP = 0x03,
WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_IMMCONST = 0x04,
WINED3D_SM4_RT_SAMPLER = 0x6, WINED3D_SM4_RT_SAMPLER = 0x06,
WINED3D_SM4_RT_RESOURCE = 0x7, WINED3D_SM4_RT_RESOURCE = 0x07,
WINED3D_SM4_RT_CONSTBUFFER = 0x8, WINED3D_SM4_RT_CONSTBUFFER = 0x08,
WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9, WINED3D_SM4_RT_IMMCONSTBUFFER = 0x09,
WINED3D_SM4_RT_PRIMID = 0xb, WINED3D_SM4_RT_PRIMID = 0x0b,
WINED3D_SM4_RT_DEPTHOUT = 0xc, WINED3D_SM4_RT_DEPTHOUT = 0x0c,
WINED3D_SM4_RT_NULL = 0xd, WINED3D_SM4_RT_NULL = 0x0d,
WINED3D_SM5_RT_STREAM = 0x10,
WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID = 0x16, WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID = 0x16,
WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17,
WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19,
@ -795,6 +797,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_CONTROL_POINT_PHASE, "", ""}, {WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_CONTROL_POINT_PHASE, "", ""},
{WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""},
{WINED3D_SM5_OP_HS_JOIN_PHASE, WINED3DSIH_HS_JOIN_PHASE, "", ""}, {WINED3D_SM5_OP_HS_JOIN_PHASE, WINED3DSIH_HS_JOIN_PHASE, "", ""},
{WINED3D_SM5_OP_EMIT_STREAM, WINED3DSIH_EMIT_STREAM, "", "f"},
{WINED3D_SM5_OP_BUFINFO, WINED3DSIH_BUFINFO, "i", "U"}, {WINED3D_SM5_OP_BUFINFO, WINED3DSIH_BUFINFO, "i", "U"},
{WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "f", "f"},
{WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"},
@ -854,7 +857,7 @@ static const enum wined3d_shader_register_type register_type_table[] =
/* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL,
/* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u,
/* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u,
/* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_STREAM */ WINED3DSPR_STREAM,
/* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u,
/* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u,
/* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u,

2
dlls/wined3d/wined3d_private.h
View File

@ -393,6 +393,7 @@ enum wined3d_shader_register_type
WINED3DSPR_LOCALTHREADID, WINED3DSPR_LOCALTHREADID,
WINED3DSPR_LOCALTHREADINDEX, WINED3DSPR_LOCALTHREADINDEX,
WINED3DSPR_IDXTEMP, WINED3DSPR_IDXTEMP,
WINED3DSPR_STREAM,
}; };
enum wined3d_data_type enum wined3d_data_type
@ -619,6 +620,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_DSY_FINE, WINED3DSIH_DSY_FINE,
WINED3DSIH_ELSE, WINED3DSIH_ELSE,
WINED3DSIH_EMIT, WINED3DSIH_EMIT,
WINED3DSIH_EMIT_STREAM,
WINED3DSIH_ENDIF, WINED3DSIH_ENDIF,
WINED3DSIH_ENDLOOP, WINED3DSIH_ENDLOOP,
WINED3DSIH_ENDREP, WINED3DSIH_ENDREP,