March 2017 - Wine-commits - list.winehq.org

Guillaume Charifi : wined3d: Recognize SM5 dcl_hs_join_phase_instance_count instruction.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 7002ab50119fb86993e4c86892dce57b54ec7f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7002ab50119fb86993e4c8689… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Thu Mar 2 15:11:47 2017 +0100 wined3d: Recognize SM5 dcl_hs_join_phase_instance_count instruction. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> 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 | 2 ++ dlls/wined3d/shader_sm4.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 8 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1872100..ff868f9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5053,6 +5053,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_FUNCTION_TABLE */ NULL, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ NULL, /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, + /* WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INDEXABLE_TEMP */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d6bb622..6d45b43 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9539,6 +9539,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_FUNCTION_TABLE */ NULL, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop, /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, + /* WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_INDEXABLE_TEMP */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a97dfb1..e337f0b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -75,6 +75,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_FUNCTION_TABLE */ "dcl_function_table", /* WINED3DSIH_DCL_GLOBAL_FLAGS */ "dcl_globalFlags", /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ "dcl_hs_fork_phase_instance_count", + /* WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT */ "dcl_hs_join_phase_instance_count", /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ "dcl_hs_max_tessfactor", /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ "dcl_immediateConstantBuffer", /* WINED3DSIH_DCL_INDEXABLE_TEMP */ "dcl_indexableTemp", @@ -2596,6 +2597,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe else if (ins.handler_idx == WINED3DSIH_DCL_TEMPS || ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT || ins.handler_idx == WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT + || ins.handler_idx == WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT || ins.handler_idx == WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT || ins.handler_idx == WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a934cdb..f305665 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -252,6 +252,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_TESSELLATOR_OUTPUT_PRIMITIVE = 0x97, WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR = 0x98, WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, + WINED3D_SM5_OP_DCL_HS_JOIN_PHASE_INSTANCE_COUNT = 0x9a, WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_UAV_RAW = 0x9d, @@ -980,6 +981,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm5_read_dcl_hs_max_tessfactor}, {WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, "", "", shader_sm4_read_declaration_count}, + {WINED3D_SM5_OP_DCL_HS_JOIN_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT, "", "", + shader_sm4_read_declaration_count}, {WINED3D_SM5_OP_DCL_THREAD_GROUP, WINED3DSIH_DCL_THREAD_GROUP, "", "", shader_sm5_read_dcl_thread_group}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 675dd50..5d106df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -607,6 +607,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_FUNCTION_TABLE, WINED3DSIH_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, + WINED3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_MAX_TESSFACTOR, WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER, WINED3DSIH_DCL_INDEXABLE_TEMP,

1 0

Guillaume Charifi : wined3d: Recognize SM5 vJoinInstanceId register.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 00460565271b2a56e8f08cdaa77008f94e2248c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00460565271b2a56e8f08cdaa… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Thu Mar 2 15:11:48 2017 +0100 wined3d: Recognize SM5 vJoinInstanceId register. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e337f0b..0e88486 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2021,6 +2021,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vForkInstanceId"); break; + case WINED3DSPR_JOININSTID: + shader_addline(buffer, "vJoinInstanceId"); + break; + case WINED3DSPR_INCONTROLPOINT: shader_addline(buffer, "vicp"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f305665..050f656 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -311,6 +311,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_FUNCTION_POINTER = 0x13, WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID = 0x16, WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, + WINED3D_SM5_RT_JOIN_INSTANCE_ID = 0x18, WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, WINED3D_SM5_RT_OUTPUT_CONTROL_POINT = 0x1a, WINED3D_SM5_RT_PATCH_CONSTANT_DATA = 0x1b, @@ -1056,7 +1057,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID */ WINED3DSPR_OUTPOINTID, /* WINED3D_SM5_RT_FORK_INSTANCE_ID */ WINED3DSPR_FORKINSTID, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_JOIN_INSTANCE_ID */ WINED3DSPR_JOININSTID, /* WINED3D_SM5_RT_INPUT_CONTROL_POINT */ WINED3DSPR_INCONTROLPOINT, /* WINED3D_SM5_RT_OUTPUT_CONTROL_POINT */ WINED3DSPR_OUTCONTROLPOINT, /* WINED3D_SM5_RT_PATCH_CONSTANT_DATA */ WINED3DSPR_PATCHCONST, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5d106df..a6e6f3e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -382,6 +382,7 @@ enum wined3d_shader_register_type WINED3DSPR_UAV, WINED3DSPR_OUTPOINTID, WINED3DSPR_FORKINSTID, + WINED3DSPR_JOININSTID, WINED3DSPR_INCONTROLPOINT, WINED3DSPR_OUTCONTROLPOINT, WINED3DSPR_PATCHCONST,

1 0

Józef Kucia : wined3d: Add support for atomic min/ max operations on thread group shared memory.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 9b1748b05f2bfc24b1510aee066edd743d54d892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b1748b05f2bfc24b1510aee0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:27 2017 +0100 wined3d: Add support for atomic min/max operations on thread group shared memory. 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/glsl_shader.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6d45b43..c6d2e39 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5034,7 +5034,10 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) break; case WINED3DSIH_ATOMIC_IMAX: case WINED3DSIH_IMM_ATOMIC_IMAX: - op = "imageAtomicMax"; + if (is_tgsm) + op = "atomicMax"; + else + op = "imageAtomicMax"; if (data_type != WINED3D_DATA_INT) { FIXME("Unhandled opcode %#x for unsigned integers.\n", ins->handler_idx); @@ -5043,7 +5046,10 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) break; case WINED3DSIH_ATOMIC_IMIN: case WINED3DSIH_IMM_ATOMIC_IMIN: - op = "imageAtomicMin"; + if (is_tgsm) + op = "atomicMin"; + else + op = "imageAtomicMin"; if (data_type != WINED3D_DATA_INT) { FIXME("Unhandled opcode %#x for unsigned integers.\n", ins->handler_idx); @@ -5059,7 +5065,10 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) break; case WINED3DSIH_ATOMIC_UMAX: case WINED3DSIH_IMM_ATOMIC_UMAX: - op = "imageAtomicMax"; + if (is_tgsm) + op = "atomicMax"; + else + op = "imageAtomicMax"; if (data_type != WINED3D_DATA_UINT) { FIXME("Unhandled opcode %#x for signed integers.\n", ins->handler_idx); @@ -5068,7 +5077,10 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) break; case WINED3DSIH_ATOMIC_UMIN: case WINED3DSIH_IMM_ATOMIC_UMIN: - op = "imageAtomicMin"; + if (is_tgsm) + op = "atomicMin"; + else + op = "imageAtomicMin"; if (data_type != WINED3D_DATA_UINT) { FIXME("Unhandled opcode %#x for signed integers.\n", ins->handler_idx);

1 0

Józef Kucia : wined3d: Add FIXME() for unhandled UAV flags.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 7da88d00664d24f3eb13d595229898736f7f27cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da88d00664d24f3eb13d5952… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:28 2017 +0100 wined3d: Add FIXME() for unhandled UAV flags. 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a8e69fc..d0d90b2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -784,6 +784,9 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces return E_INVALIDARG; view->desc = *desc; + if (desc->flags & (WINED3D_VIEW_BUFFER_APPEND | WINED3D_VIEW_BUFFER_COUNTER)) + FIXME("Unhandled view flags %#x.\n", desc->flags); + wined3d_resource_incref(view->resource = resource); wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_cs_init, view);

1 0

Józef Kucia : wined3d: Add ARB_shader_atomic_counters extension.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: c56554168557eab90f3180ddf993389965ff86b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56554168557eab90f3180ddf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:29 2017 +0100 wined3d: Add ARB_shader_atomic_counters 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 | 21 +++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 25 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5fa34e5..425d1fd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -147,6 +147,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, + {"GL_ARB_shader_atomic_counters", ARB_SHADER_ATOMIC_COUNTERS }, {"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 }, @@ -2788,6 +2789,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetSamplerParameterfv) USE_GL_FUNC(glGetSamplerParameterIiv) USE_GL_FUNC(glGetSamplerParameterIuiv) + /* GL_ARB_shader_atomic_counters */ + USE_GL_FUNC(glGetActiveAtomicCounterBufferiv) /* GL_ARB_shader_image_load_store */ USE_GL_FUNC(glBindImageTexture) USE_GL_FUNC(glMemoryBarrier) @@ -3659,6 +3662,23 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.texture_buffer_offset_alignment = gl_max; TRACE("Minimum required texture buffer offset alignment %d.\n", gl_max); } + if (gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS]) + { + GLint max_fragment_buffers, max_combined_buffers, max_bindings; + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS, &max_fragment_buffers); + TRACE("Max fragment atomic counter buffers: %d.\n", max_fragment_buffers); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS, &max_combined_buffers); + TRACE("Max combined atomic counter buffers: %d.\n", max_combined_buffers); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS, &max_bindings); + TRACE("Max atomic counter buffer bindings: %d.\n", max_bindings); + if (max_fragment_buffers < MAX_UNORDERED_ACCESS_VIEWS + || max_combined_buffers < MAX_UNORDERED_ACCESS_VIEWS + || max_bindings < MAX_UNORDERED_ACCESS_VIEWS) + { + WARN("Disabling ARB_shader_atomic_counters.\n"); + gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS] = FALSE; + } + } if (gl_info->supported[NV_LIGHT_MAX_EXPONENT]) gl_info->gl_ops.gl.p_glGetFloatv(GL_MAX_SHININESS_NV, &gl_info->limits.shininess); @@ -3766,6 +3786,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, + {ARB_SHADER_ATOMIC_COUNTERS, MAKEDWORD_VERSION(4, 2)}, {ARB_SHADER_IMAGE_LOAD_STORE, MAKEDWORD_VERSION(4, 2)}, {ARB_SHADING_LANGUAGE_420PACK, MAKEDWORD_VERSION(4, 2)}, {ARB_SHADING_LANGUAGE_PACKING, MAKEDWORD_VERSION(4, 2)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c6d2e39..9b1d5ee 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6619,6 +6619,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, { if (gl_info->supported[ARB_GPU_SHADER5]) shader_addline(buffer, "#extension GL_ARB_gpu_shader5 : enable\n"); + if (gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS]) + shader_addline(buffer, "#extension GL_ARB_shader_atomic_counters : enable\n"); if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); if (gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE]) @@ -9444,6 +9446,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s && gl_info->supported[ARB_COMPUTE_SHADER] && gl_info->supported[ARB_DERIVATIVE_CONTROL] && gl_info->supported[ARB_GPU_SHADER5] + && gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] && gl_info->supported[ARB_SHADER_IMAGE_SIZE] && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index fa5985c..00fb7cb 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -80,6 +80,7 @@ enum wined3d_gl_extension ARB_POINT_SPRITE, ARB_PROVOKING_VERTEX, ARB_SAMPLER_OBJECTS, + ARB_SHADER_ATOMIC_COUNTERS, ARB_SHADER_BIT_ENCODING, ARB_SHADER_IMAGE_LOAD_STORE, ARB_SHADER_IMAGE_SIZE,

1 0

Józef Kucia : wined3d: Implement SM5 imm_atomic_alloc instruction.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 87ef57aff1bb8fc8323300a32988eefd891cc282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ef57aff1bb8fc8323300a32… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:30 2017 +0100 wined3d: Implement SM5 imm_atomic_alloc instruction. 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/glsl_shader.c | 15 ++++++++++++++- dlls/wined3d/shader.c | 12 +++++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9b1d5ee..8948e67 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2225,6 +2225,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont else shader_addline(buffer, "writeonly uniform %s%s %s_image%u;\n", image_type_prefix, image_type, prefix, i); + + if (reg_maps->uav_counter_mask & (1u << i)) + shader_addline(buffer, "layout(binding = %u) uniform atomic_uint %s_counter%u;\n", + i, prefix, i); } /* Declare uniforms for NP2 texcoord fixup: @@ -5145,6 +5149,15 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) string_buffer_release(priv->string_buffers, address); } +static void shader_glsl_uav_counter(const struct wined3d_shader_instruction *ins) +{ + const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); + + shader_glsl_append_dst(ins->ctx->buffer, ins); + shader_addline(ins->ctx->buffer, "atomicCounterIncrement(%s_counter%u));\n", + prefix, ins->src[0].reg.idx[0].offset); +} + static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; @@ -9637,7 +9650,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMAD */ shader_glsl_mad, /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, - /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, + /* WINED3DSIH_IMM_ATOMIC_ALLOC */ shader_glsl_uav_counter, /* WINED3DSIH_IMM_ATOMIC_AND */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0e88486..10018ed 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1370,7 +1370,17 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } } - if ((WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) + if (ins.handler_idx == WINED3DSIH_IMM_ATOMIC_ALLOC) + { + unsigned int reg_idx = ins.src[0].reg.idx[0].offset; + if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS) + { + ERR("Invalid UAV index %u.\n", reg_idx); + break; + } + reg_maps->uav_counter_mask |= (1u << reg_idx); + } + else if ((WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) || (WINED3DSIH_IMM_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_IMM_ATOMIC_XOR && ins.handler_idx != WINED3DSIH_IMM_ATOMIC_CONSUME) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a6e6f3e..101fe90 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -896,6 +896,7 @@ struct wined3d_shader_reg_maps BYTE luminanceparams; /* MAX_TEXTURES, 8 */ struct wined3d_shader_resource_info uav_resource_info[MAX_UNORDERED_ACCESS_VIEWS]; DWORD uav_read_mask; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ + DWORD uav_counter_mask; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ WORD usesnrm : 1; WORD vpos : 1;

1 0

Józef Kucia : wined3d: Implement SM5 imm_atomic_consume instruction.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 35de12fcd56a1b4d58508bd9dd79d0af140e7c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35de12fcd56a1b4d58508bd9d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:31 2017 +0100 wined3d: Implement SM5 imm_atomic_consume instruction. 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/glsl_shader.c | 11 ++++++++--- dlls/wined3d/shader.c | 6 ++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8948e67..8e54a68 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5152,10 +5152,15 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) static void shader_glsl_uav_counter(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); + const char *op; + + if (ins->handler_idx == WINED3DSIH_IMM_ATOMIC_ALLOC) + op = "atomicCounterIncrement"; + else + op = "atomicCounterDecrement"; shader_glsl_append_dst(ins->ctx->buffer, ins); - shader_addline(ins->ctx->buffer, "atomicCounterIncrement(%s_counter%u));\n", - prefix, ins->src[0].reg.idx[0].offset); + shader_addline(ins->ctx->buffer, "%s(%s_counter%u));\n", op, prefix, ins->src[0].reg.idx[0].offset); } static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) @@ -9653,7 +9658,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_ALLOC */ shader_glsl_uav_counter, /* WINED3DSIH_IMM_ATOMIC_AND */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ shader_glsl_atomic, - /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, + /* WINED3DSIH_IMM_ATOMIC_CONSUME */ shader_glsl_uav_counter, /* WINED3DSIH_IMM_ATOMIC_EXCH */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IMAX */ shader_glsl_atomic, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 10018ed..b07131d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1370,7 +1370,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } } - if (ins.handler_idx == WINED3DSIH_IMM_ATOMIC_ALLOC) + if (ins.handler_idx == WINED3DSIH_IMM_ATOMIC_ALLOC || ins.handler_idx == WINED3DSIH_IMM_ATOMIC_CONSUME) { unsigned int reg_idx = ins.src[0].reg.idx[0].offset; if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS) @@ -1381,9 +1381,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_maps->uav_counter_mask |= (1u << reg_idx); } else if ((WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) - || (WINED3DSIH_IMM_ATOMIC_AND <= ins.handler_idx - && ins.handler_idx <= WINED3DSIH_IMM_ATOMIC_XOR - && ins.handler_idx != WINED3DSIH_IMM_ATOMIC_CONSUME) + || (WINED3DSIH_IMM_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_IMM_ATOMIC_XOR) || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_UAV) || (ins.handler_idx == WINED3DSIH_LD_STRUCTURED && ins.src[2].reg.type == WINED3DSPR_UAV))

1 0

Józef Kucia : wined3d: Implement UAV counters.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 6256956a4188c2d291dd6c9d236cce904a3374b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6256956a4188c2d291dd6c9d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:32 2017 +0100 wined3d: Implement UAV counters. 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 | 3 +++ dlls/wined3d/view.c | 46 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 10a7222..784307c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3476,6 +3476,9 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, GL_EXTCALL(glBindImageTexture(i, texture_name, level, GL_TRUE, 0, GL_READ_WRITE, view->format->glInternal)); + + if (view->counter_bo) + GL_EXTCALL(glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, i, view->counter_bo)); } checkGLcall("Bind unordered access views"); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index d0d90b2..ff31de2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -206,19 +206,15 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target context_release(context); } -static void create_buffer_texture(struct wined3d_gl_view *view, +static void create_buffer_texture(struct wined3d_gl_view *view, struct wined3d_context *context, struct wined3d_buffer *buffer, const struct wined3d_format *view_format, unsigned int offset, unsigned int size) { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + const struct wined3d_gl_info *gl_info = context->gl_info; - context = context_acquire(buffer->resource.device, NULL, 0); - gl_info = context->gl_info; if (!gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) { FIXME("OpenGL implementation does not support buffer textures.\n"); - context_release(context); return; } @@ -226,7 +222,6 @@ static void create_buffer_texture(struct wined3d_gl_view *view, { FIXME("Buffer offset %u is not %u byte aligned.\n", offset, gl_info->limits.texture_buffer_offset_alignment); - context_release(context); return; } @@ -251,11 +246,9 @@ static void create_buffer_texture(struct wined3d_gl_view *view, context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); - - context_release(context); } -static void create_buffer_view(struct wined3d_gl_view *view, +static void create_buffer_view(struct wined3d_gl_view *view, struct wined3d_context *context, const struct wined3d_view_desc *desc, struct wined3d_buffer *buffer, const struct wined3d_format *view_format) { @@ -272,7 +265,7 @@ static void create_buffer_view(struct wined3d_gl_view *view, size = desc->u.buffer.count * view_format->byte_count; } - create_buffer_texture(view, buffer, view_format, offset, size); + create_buffer_texture(view, context, buffer, view_format, offset, size); } ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) @@ -563,8 +556,11 @@ static void wined3d_shader_resource_view_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); + struct wined3d_context *context; - create_buffer_view(&view->gl_view, desc, buffer, view_format); + context = context_acquire(resource->device, NULL, 0); + create_buffer_view(&view->gl_view, context, desc, buffer, view_format); + context_release(context); } else { @@ -675,15 +671,18 @@ static void wined3d_unordered_access_view_destroy_object(void *object) { struct wined3d_unordered_access_view *view = object; - if (view->gl_view.name) + if (view->gl_view.name || view->counter_bo) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; context = context_acquire(view->resource->device, NULL, 0); gl_info = context->gl_info; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); - checkGLcall("glDeleteTextures"); + if (view->gl_view.name) + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); + if (view->counter_bo) + GL_EXTCALL(glDeleteBuffers(1, &view->counter_bo)); + checkGLcall("delete resources"); context_release(context); } @@ -751,8 +750,21 @@ static void wined3d_unordered_access_view_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); + struct wined3d_context *context; - create_buffer_view(&view->gl_view, desc, buffer, view->format); + context = context_acquire(resource->device, NULL, 0); + gl_info = context->gl_info; + create_buffer_view(&view->gl_view, context, desc, buffer, view->format); + if (desc->flags & WINED3D_VIEW_BUFFER_COUNTER) + { + static const GLuint initial_value = 0; + GL_EXTCALL(glGenBuffers(1, &view->counter_bo)); + GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, view->counter_bo)); + GL_EXTCALL(glBufferData(GL_ATOMIC_COUNTER_BUFFER, + sizeof(initial_value), &initial_value, GL_STATIC_DRAW)); + checkGLcall("create atomic counter buffer"); + } + context_release(context); } else { @@ -784,7 +796,7 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces return E_INVALIDARG; view->desc = *desc; - if (desc->flags & (WINED3D_VIEW_BUFFER_APPEND | WINED3D_VIEW_BUFFER_COUNTER)) + if (desc->flags & WINED3D_VIEW_BUFFER_APPEND) FIXME("Unhandled view flags %#x.\n", desc->flags); wined3d_resource_incref(view->resource = resource); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 101fe90..d329f11 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3410,6 +3410,7 @@ struct wined3d_unordered_access_view struct wined3d_view_desc desc; struct wined3d_gl_view gl_view; + GLuint counter_bo; }; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view,

1 0

Jacek Caban : psapi.h: Added support for PSAPI_VERSION version 2.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 853b4148dd9c352d6cb9608df6e281c4fffec590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=853b4148dd9c352d6cb9608df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 3 13:11:30 2017 +0100 psapi.h: Added support for PSAPI_VERSION version 2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/psapi.h | 34 ++++++++++++++++++++++++++++++++++ programs/wscript/tests/run.c | 1 + 2 files changed, 35 insertions(+) diff --git a/include/psapi.h b/include/psapi.h index fbdd903..c7663f8 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -21,6 +21,10 @@ #ifndef __WINE_PSAPI_H #define __WINE_PSAPI_H +#ifndef PSAPI_VERSION +#define PSAPI_VERSION 2 +#endif + typedef struct _MODULEINFO { LPVOID lpBaseOfDll; DWORD SizeOfImage; @@ -79,6 +83,36 @@ typedef BOOL (*PENUM_PAGE_FILE_CALLBACKW) (LPVOID, PENUM_PAGE_FILE_INFORMATION, extern "C" { #endif +#if PSAPI_VERSION > 1 +#define EnumProcesses K32EnumProcesses +#define EnumProcessModules K32EnumProcessModules +#define EnumProcessModulesEx K32EnumProcessModulesEx +#define GetModuleBaseNameA K32GetModuleBaseNameA +#define GetModuleBaseNameW K32GetModuleBaseNameW +#define GetModuleFileNameExA K32GetModuleFileNameExA +#define GetModuleFileNameExW K32GetModuleFileNameExW +#define GetModuleInformation K32GetModuleInformation +#define EmptyWorkingSet K32EmptyWorkingSet +#define QueryWorkingSet K32QueryWorkingSet +#define QueryWorkingSetEx K32QueryWorkingSetEx +#define InitializeProcessForWsWatch K32InitializeProcessForWsWatch +#define GetWsChanges K32GetWsChanges +#define GetWsChangesEx K32GetWsChangesEx +#define GetMappedFileNameW K32GetMappedFileNameW +#define GetMappedFileNameA K32GetMappedFileNameA +#define EnumDeviceDrivers K32EnumDeviceDrivers +#define GetDeviceDriverBaseNameA K32GetDeviceDriverBaseNameA +#define GetDeviceDriverBaseNameW K32GetDeviceDriverBaseNameW +#define GetDeviceDriverFileNameA K32GetDeviceDriverFileNameA +#define GetDeviceDriverFileNameW K32GetDeviceDriverFileNameW +#define GetProcessMemoryInfo K32GetProcessMemoryInfo +#define GetPerformanceInfo K32GetPerformanceInfo +#define EnumPageFilesW K32EnumPageFilesW +#define EnumPageFilesA K32EnumPageFilesA +#define GetProcessImageFileNameA K32GetProcessImageFileNameA +#define GetProcessImageFileNameW K32GetProcessImageFileNameW +#endif + BOOL WINAPI EnumProcesses(DWORD*, DWORD, DWORD*); BOOL WINAPI EnumProcessModules(HANDLE, HMODULE*, DWORD, LPDWORD); BOOL WINAPI EnumProcessModulesEx(HANDLE, HMODULE*, DWORD, LPDWORD, DWORD); diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index eb840cc..770fd8f 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -21,6 +21,7 @@ #define COBJMACROS #define CONST_VTABLE +#define PSAPI_VERSION 1 #include <initguid.h> #include <windows.h> #include <psapi.h>

1 0

Jacek Caban : dbghelp: Removed no longer needed psapi import.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 4bbb252adc266ce06ef46bdd905682b446064993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bbb252adc266ce06ef46bdd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 3 13:11:38 2017 +0100 dbghelp: Removed no longer needed psapi import. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 86846cb..3e120e8 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -1,7 +1,6 @@ MODULE = dbghelp.dll IMPORTLIB = dbghelp EXTRADEFS = -D_IMAGEHLP_SOURCE_ -IMPORTS = psapi DELAYIMPORTS = version EXTRALIBS = $(Z_LIBS) $(CORESERVICES_LIBS) $(COREFOUNDATION_LIBS)

1 0