November 2016 - Wine-commits

Józef Kucia : d3d11/tests: Add test for typed UAV loads.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: 20fdcbf2a08f1637d1ee160a2049830d490b6081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20fdcbf2a08f1637d1ee160a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 30 12:47:29 2016 +0100 d3d11/tests: Add test for typed UAV loads. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 308 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 308 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20fdcbf2a08f1637d1ee1…

1 0

Józef Kucia : wined3d: Recognize SM5 sync opcode.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: df7512c5e95a98edf145df1e22879800adaa5405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df7512c5e95a98edf145df1e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 30 12:47:30 2016 +0100 wined3d: Recognize SM5 sync opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 22 ++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ 5 files changed, 44 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bbafe69..fe5b5c8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5364,6 +5364,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SUB */ shader_hw_map2gl, /* WINED3DSIH_SWAPC */ NULL, /* WINED3DSIH_SWITCH */ NULL, + /* WINED3DSIH_SYNC */ NULL, /* WINED3DSIH_TEX */ pshader_hw_tex, /* WINED3DSIH_TEXBEM */ pshader_hw_texbem, /* WINED3DSIH_TEXBEML */ pshader_hw_texbem, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c95dc00..ee5b6c3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9027,6 +9027,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWAPC */ NULL, /* WINED3DSIH_SWITCH */ shader_glsl_switch, + /* WINED3DSIH_SYNC */ NULL, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem, /* WINED3DSIH_TEXBEML */ shader_glsl_texbem, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index eadf331..e6eb351 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -205,6 +205,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SUB */ "sub", /* WINED3DSIH_SWAPC */ "swapc", /* WINED3DSIH_SWITCH */ "switch", + /* WINED3DSIH_SYNC */ "sync", /* WINED3DSIH_TEX */ "texld", /* WINED3DSIH_TEXBEM */ "texbem", /* WINED3DSIH_TEXBEML */ "texbeml", @@ -1439,6 +1440,23 @@ static void shader_dump_global_flags(struct wined3d_string_buffer *buffer, DWORD shader_addline(buffer, "unknown_flags(%#x)", global_flags); } +static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD sync_flags) +{ + if (sync_flags & WINED3DSSF_GROUP_SHARED_MEMORY) + { + shader_addline(buffer, "_g"); + sync_flags &= ~WINED3DSSF_GROUP_SHARED_MEMORY; + } + if (sync_flags & WINED3DSSF_THREAD_GROUP) + { + shader_addline(buffer, "_t"); + sync_flags &= ~WINED3DSSF_THREAD_GROUP; + } + + if (sync_flags) + shader_addline(buffer, "_unknown_flags(%#x)", sync_flags); +} + static void shader_dump_tessellator_domain(struct wined3d_string_buffer *buffer, enum wined3d_tessellator_domain domain) { @@ -2483,6 +2501,10 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); } } + else if (ins.handler_idx == WINED3DSIH_SYNC) + { + shader_dump_sync_flags(&buffer, ins.flags); + } if (wined3d_shader_instruction_has_texel_offset(&ins)) shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 84b22c3..2775a6e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -64,6 +64,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT 11 #define WINED3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT) +#define WINED3D_SM5_SYNC_FLAGS_SHIFT 11 +#define WINED3D_SM5_SYNC_FLAGS_MASK (0xffu << WINED3D_SM5_SYNC_FLAGS_SHIFT) + #define WINED3D_SM5_TESSELLATOR_SHIFT 11 #define WINED3D_SM5_TESSELLATOR_MASK (0xfu << WINED3D_SM5_TESSELLATOR_SHIFT) @@ -246,6 +249,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, + WINED3D_SM5_OP_SYNC = 0xbe, }; enum wined3d_sm4_register_type @@ -681,6 +685,13 @@ static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instru ins->declaration.structured_resource.byte_stride = *tokens; } +static void shader_sm5_read_sync(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + ins->flags = (opcode_token & WINED3D_SM5_SYNC_FLAGS_MASK) >> WINED3D_SM5_SYNC_FLAGS_SHIFT; +} + /* * f -> WINED3D_DATA_FLOAT * i -> WINED3D_DATA_INT @@ -862,6 +873,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, + {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", + shader_sm5_read_sync}, }; static const enum wined3d_shader_register_type register_type_table[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ae48020..c6acdd1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -463,6 +463,12 @@ enum wined3d_shader_global_flags WINED3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x8, }; +enum wined3d_shader_sync_flags +{ + WINED3DSSF_THREAD_GROUP = 0x1, + WINED3DSSF_GROUP_SHARED_MEMORY = 0x2, +}; + enum wined3d_tessellator_domain { WINED3D_TESSELLATOR_DOMAIN_LINE = 1, @@ -719,6 +725,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SUB, WINED3DSIH_SWAPC, WINED3DSIH_SWITCH, + WINED3DSIH_SYNC, WINED3DSIH_TEX, WINED3DSIH_TEXBEM, WINED3DSIH_TEXBEML,

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_uav_raw opcode.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: 17c7cbeb887d4f91ff06c58b807b2c4da1c004e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c7cbeb887d4f91ff06c58b8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 30 12:47:31 2016 +0100 wined3d: Recognize SM5 dcl_uav_raw opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 20 ++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 6 ++++++ 5 files changed, 42 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fe5b5c8..f8665dd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5248,6 +5248,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, + /* WINED3DSIH_DCL_UAV_RAW */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ee5b6c3..3afed69 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8911,6 +8911,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, + /* WINED3DSIH_DCL_UAV_RAW */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e6eb351..05ab24d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -89,6 +89,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TGSM_RAW */ "dcl_tgsm_raw", /* WINED3DSIH_DCL_TGSM_STRUCTURED */ "dcl_tgsm_structured", /* WINED3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", + /* WINED3DSIH_DCL_UAV_RAW */ "dcl_uav_raw", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", @@ -1457,6 +1458,18 @@ static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD s shader_addline(buffer, "_unknown_flags(%#x)", sync_flags); } +static void shader_dump_uav_flags(struct wined3d_string_buffer *buffer, DWORD uav_flags) +{ + if (uav_flags & WINED3DSUF_GLOBALLY_COHERENT) + { + shader_addline(buffer, "_glc"); + uav_flags &= ~WINED3DSUF_GLOBALLY_COHERENT; + } + + if (uav_flags) + shader_addline(buffer, "_unknown_flags(%#x)", uav_flags); +} + static void shader_dump_tessellator_domain(struct wined3d_string_buffer *buffer, enum wined3d_tessellator_domain domain) { @@ -2417,6 +2430,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe ins.declaration.thread_group_size.y, ins.declaration.thread_group_size.z); } + else if (ins.handler_idx == WINED3DSIH_DCL_UAV_RAW) + { + shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); + shader_dump_uav_flags(&buffer, ins.flags); + shader_addline(&buffer, " "); + shader_dump_dst_param(&buffer, &ins.declaration.dst, &shader_version); + } else if (ins.handler_idx == WINED3DSIH_DEF) { shader_addline(&buffer, "def c%u = %.8e, %.8e, %.8e, %.8e", shader_get_float_offset(ins.dst[0].reg.type, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 2775a6e..94b1229 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -64,6 +64,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT 11 #define WINED3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT) +#define WINED3D_SM5_UAV_FLAGS_SHIFT 11 +#define WINED3D_SM5_UAV_FLAGS_MASK (0xffu << WINED3D_SM5_UAV_FLAGS_SHIFT) + #define WINED3D_SM5_SYNC_FLAGS_SHIFT 11 #define WINED3D_SM5_SYNC_FLAGS_MASK (0xffu << WINED3D_SM5_SYNC_FLAGS_SHIFT) @@ -237,6 +240,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, + WINED3D_SM5_OP_DCL_UAV_RAW = 0x9d, WINED3D_SM5_OP_DCL_TGSM_RAW = 0x9f, WINED3D_SM5_OP_DCL_TGSM_STRUCTURED = 0xa0, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, @@ -660,6 +664,14 @@ static void shader_sm5_read_dcl_thread_group(struct wined3d_shader_instruction * ins->declaration.thread_group_size.z = *tokens++; } +static void shader_sm5_read_dcl_uav_raw(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_UAV, &ins->declaration.dst); + ins->flags = (opcode_token & WINED3D_SM5_UAV_FLAGS_MASK) >> WINED3D_SM5_UAV_FLAGS_SHIFT; +} + static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -858,6 +870,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm5_read_dcl_thread_group}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", "", shader_sm4_read_dcl_resource}, + {WINED3D_SM5_OP_DCL_UAV_RAW, WINED3DSIH_DCL_UAV_RAW, "", "", + shader_sm5_read_dcl_uav_raw}, {WINED3D_SM5_OP_DCL_TGSM_RAW, WINED3DSIH_DCL_TGSM_RAW, "", "", shader_sm5_read_dcl_tgsm_raw}, {WINED3D_SM5_OP_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_TGSM_STRUCTURED, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c6acdd1..31ab656 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -469,6 +469,11 @@ enum wined3d_shader_sync_flags WINED3DSSF_GROUP_SHARED_MEMORY = 0x2, }; +enum wined3d_shader_uav_flags +{ + WINED3DSUF_GLOBALLY_COHERENT = 0x20, +}; + enum wined3d_tessellator_domain { WINED3D_TESSELLATOR_DOMAIN_LINE = 1, @@ -609,6 +614,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TGSM_RAW, WINED3DSIH_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_THREAD_GROUP, + WINED3DSIH_DCL_UAV_RAW, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF,

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_uav_structured opcode.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: a592f35d498964eb33a8884f6ebca5946440b541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a592f35d498964eb33a8884f6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 30 12:47:32 2016 +0100 wined3d: Recognize SM5 dcl_uav_structured opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 14 ++++++++++++++ dlls/wined3d/shader_sm4.c | 14 +++++++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f8665dd..7048021 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5249,6 +5249,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_RAW */ NULL, + /* WINED3DSIH_DCL_UAV_STRUCTURED */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3afed69..f1f615d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8912,6 +8912,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_RAW */ NULL, + /* WINED3DSIH_DCL_UAV_STRUCTURED */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 05ab24d..765c682 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -90,6 +90,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TGSM_STRUCTURED */ "dcl_tgsm_structured", /* WINED3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", /* WINED3DSIH_DCL_UAV_RAW */ "dcl_uav_raw", + /* WINED3DSIH_DCL_UAV_STRUCTURED */ "dcl_uav_structured", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", @@ -1465,6 +1466,11 @@ static void shader_dump_uav_flags(struct wined3d_string_buffer *buffer, DWORD ua shader_addline(buffer, "_glc"); uav_flags &= ~WINED3DSUF_GLOBALLY_COHERENT; } + if (uav_flags & WINED3DSUF_ORDER_PRESERVING_COUNTER) + { + shader_addline(buffer, "_opc"); + uav_flags &= ~WINED3DSUF_ORDER_PRESERVING_COUNTER; + } if (uav_flags) shader_addline(buffer, "_unknown_flags(%#x)", uav_flags); @@ -2437,6 +2443,14 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, " "); shader_dump_dst_param(&buffer, &ins.declaration.dst, &shader_version); } + else if (ins.handler_idx == WINED3DSIH_DCL_UAV_STRUCTURED) + { + shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); + shader_dump_uav_flags(&buffer, ins.flags); + shader_addline(&buffer, " "); + shader_dump_dst_param(&buffer, &ins.declaration.structured_resource.reg, &shader_version); + shader_addline(&buffer, ", %u", ins.declaration.structured_resource.byte_stride); + } else if (ins.handler_idx == WINED3DSIH_DEF) { shader_addline(&buffer, "def c%u = %.8e, %.8e, %.8e, %.8e", shader_get_float_offset(ins.dst[0].reg.type, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 94b1229..30dec14 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -65,7 +65,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT) #define WINED3D_SM5_UAV_FLAGS_SHIFT 11 -#define WINED3D_SM5_UAV_FLAGS_MASK (0xffu << WINED3D_SM5_UAV_FLAGS_SHIFT) +#define WINED3D_SM5_UAV_FLAGS_MASK (0x8fffu << WINED3D_SM5_UAV_FLAGS_SHIFT) #define WINED3D_SM5_SYNC_FLAGS_SHIFT 11 #define WINED3D_SM5_SYNC_FLAGS_MASK (0xffu << WINED3D_SM5_SYNC_FLAGS_SHIFT) @@ -241,6 +241,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_UAV_RAW = 0x9d, + WINED3D_SM5_OP_DCL_UAV_STRUCTURED = 0x9e, WINED3D_SM5_OP_DCL_TGSM_RAW = 0x9f, WINED3D_SM5_OP_DCL_TGSM_STRUCTURED = 0xa0, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, @@ -672,6 +673,15 @@ static void shader_sm5_read_dcl_uav_raw(struct wined3d_shader_instruction *ins, ins->flags = (opcode_token & WINED3D_SM5_UAV_FLAGS_MASK) >> WINED3D_SM5_UAV_FLAGS_SHIFT; } +static void shader_sm5_read_dcl_uav_structured(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_UAV, &ins->declaration.structured_resource.reg); + ins->flags = (opcode_token & WINED3D_SM5_UAV_FLAGS_MASK) >> WINED3D_SM5_UAV_FLAGS_SHIFT; + ins->declaration.structured_resource.byte_stride = *tokens; +} + static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -872,6 +882,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_resource}, {WINED3D_SM5_OP_DCL_UAV_RAW, WINED3DSIH_DCL_UAV_RAW, "", "", shader_sm5_read_dcl_uav_raw}, + {WINED3D_SM5_OP_DCL_UAV_STRUCTURED, WINED3DSIH_DCL_UAV_STRUCTURED, "", "", + shader_sm5_read_dcl_uav_structured}, {WINED3D_SM5_OP_DCL_TGSM_RAW, WINED3DSIH_DCL_TGSM_RAW, "", "", shader_sm5_read_dcl_tgsm_raw}, {WINED3D_SM5_OP_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_TGSM_STRUCTURED, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31ab656..cc3dd58 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -472,6 +472,7 @@ enum wined3d_shader_sync_flags enum wined3d_shader_uav_flags { WINED3DSUF_GLOBALLY_COHERENT = 0x20, + WINED3DSUF_ORDER_PRESERVING_COUNTER = 0x8000, }; enum wined3d_tessellator_domain @@ -615,6 +616,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_THREAD_GROUP, WINED3DSIH_DCL_UAV_RAW, + WINED3DSIH_DCL_UAV_STRUCTURED, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF,

1 0

Józef Kucia : wined3d: Use signed integers for addressing in ld_structured opcode.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: 1036c7e7a211dce05589e905f1e1df2274094ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1036c7e7a211dce05589e905f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 30 12:47:33 2016 +0100 wined3d: Use signed integers for addressing in ld_structured opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 30dec14..02e121c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -894,7 +894,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "U", "iu"}, {WINED3D_SM5_OP_LD_RAW, WINED3DSIH_LD_RAW, "u", "iU"}, {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, - {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, + {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "iiR"}, {WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"},

1 0

Józef Kucia : include: Add missing D3D11_BUFFER_UAV_FLAG declaration.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: 2e8a5290885caa7644a85d682d7e2d15ff5f27d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e8a5290885caa7644a85d682… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 30 12:47:34 2016 +0100 include: Add missing D3D11_BUFFER_UAV_FLAG declaration. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 262c932..3ca697b 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -543,6 +543,13 @@ typedef enum D3D11_DSV_FLAG D3D11_DSV_READ_ONLY_STENCIL = 0x2, } D3D11_DSV_FLAG; +typedef enum D3D11_UAV_FLAG +{ + D3D11_BUFFER_UAV_FLAG_RAW = 0x1, + D3D11_BUFFER_UAV_FLAG_APPEND = 0x2, + D3D11_BUFFER_UAV_FLAG_COUNTER = 0x4, +} D3D11_UAV_FLAG; + typedef enum D3D11_INPUT_CLASSIFICATION { D3D11_INPUT_PER_VERTEX_DATA,

1 0

Francois Gouget : testbot/TestAgent: Fix SIGALRM handling in _SetError().
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: tools Branch: master Commit: 908ce0ec07f18791d7568d062a6394baeea0368b URL: http://source.winehq.org/git/tools.git/?a=commit;h=908ce0ec07f18791d7568d06… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 30 09:01:03 2016 +0100 testbot/TestAgent: Fix SIGALRM handling in _SetError(). SIGALRM must always be caught otherwise the script dies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index da10672..b0e59d1 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -214,6 +214,7 @@ sub _SetError($$$) my $ncerr; eval { + local $SIG{ALRM} = sub { die "timeout" }; alarm(2); $self->{fd}->read($ncerr, 1024, 1); alarm(0);

1 0

Józef Kucia : wined3d: Unbind image textures in context_bind_unordered_access_views().
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 66aa910bd0395de5a0bed604e08861000ad287b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66aa910bd0395de5a0bed604e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:27 2016 +0100 wined3d: Unbind image textures in context_bind_unordered_access_views(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 989daf2..727f074 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3409,6 +3409,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, if (!(view = state->unordered_access_view[i])) { WARN("No unordered access view bound at index %u.\n", i); + GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); continue; }

1 0

Józef Kucia : wined3d: Implement wined3d_unordered_access_view_invalidate_location() for 3D textures.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 03ceb5fa84ecbc9f76339c542271c9fbc58a3d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ceb5fa84ecbc9f76339c542… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:28 2016 +0100 wined3d: Implement wined3d_unordered_access_view_invalidate_location() for 3D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e2b52ef..86d3ebb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -508,11 +508,10 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ DWORD location) { struct wined3d_resource *resource = view->resource; + unsigned int i, sub_resource_idx, layer_count; struct wined3d_texture *texture; - unsigned int sub_resource_idx; - unsigned int i; - if (resource->type == WINED3D_RTYPE_BUFFER || resource->type == WINED3D_RTYPE_TEXTURE_3D) + if (resource->type == WINED3D_RTYPE_BUFFER) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); return; @@ -521,7 +520,8 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ texture = texture_from_resource(resource); sub_resource_idx = view->layer_idx * texture->level_count + view->level_idx; - for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + layer_count = (resource->type != WINED3D_RTYPE_TEXTURE_3D) ? view->layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_invalidate_location(texture, sub_resource_idx, location); }

1 0

Józef Kucia : wined3d: Add ARB_shader_image_size extension.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 8fa59b8d10e3cf98e7cce8948caee80efddb7f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa59b8d10e3cf98e7cce8948… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:29 2016 +0100 wined3d: Add ARB_shader_image_size extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 5 ++++- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5b56ae4..f3bb385 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -146,6 +146,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, {"GL_ARB_shader_bit_encoding", ARB_SHADER_BIT_ENCODING }, {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, + {"GL_ARB_shader_image_size", ARB_SHADER_IMAGE_SIZE }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shadow", ARB_SHADOW }, @@ -3632,6 +3633,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, + {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 74a6060..0d9eb67 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5995,6 +5995,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); if (gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE]) shader_addline(buffer, "#extension GL_ARB_shader_image_load_store : enable\n"); + if (gl_info->supported[ARB_SHADER_IMAGE_SIZE]) + shader_addline(buffer, "#extension GL_ARB_shader_image_size : enable\n"); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) @@ -8731,7 +8733,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s * accordingly. */ if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3] && gl_info->supported[ARB_DERIVATIVE_CONTROL] - && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE]) + && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] + && gl_info->supported[ARB_SHADER_IMAGE_SIZE]) shader_model = 5; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS] diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index d0b3102..2bafa89 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -79,6 +79,7 @@ enum wined3d_gl_extension ARB_SAMPLER_OBJECTS, ARB_SHADER_BIT_ENCODING, ARB_SHADER_IMAGE_LOAD_STORE, + ARB_SHADER_IMAGE_SIZE, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADOW,

1 0