wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Józef Kucia : wined3d: Don' t leak texture in wined3d_unordered_access_view_destroy_object().
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: b5b26c204f9905d8c2c41817691d1b275d6f9659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b26c204f9905d8c2c418176… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 09:44:29 2017 +0100 wined3d: Don't leak texture in wined3d_unordered_access_view_destroy_object(). 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 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a74a2ea..a8e69fc 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -673,7 +673,21 @@ ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access static void wined3d_unordered_access_view_destroy_object(void *object) { - HeapFree(GetProcessHeap(), 0, object); + struct wined3d_unordered_access_view *view = object; + + if (view->gl_view.name) + { + 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"); + context_release(context); + } + + HeapFree(GetProcessHeap(), 0, view); } ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access_view *view)

1 0

Józef Kucia : d3d11/tests: Add test for thread group shared memory.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: adb6a9074da340cb35286971eab3fad52dd8441b URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb6a9074da340cb35286971e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:31 2017 +0100 d3d11/tests: Add test for 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/d3d11/tests/d3d11.c | 284 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 284 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adb6a9074da340cb35286…

1 0

Józef Kucia : wined3d: Add ARB_shader_storage_buffer_object extension.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 700dd3518b5e4f8a18fe9ee953e66cada264fa8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=700dd3518b5e4f8a18fe9ee95… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:30 2017 +0100 wined3d: Add ARB_shader_storage_buffer_object extension. Nvidia binary drivers require the ARB_shader_storage_buffer_object extension to be enabled in order to use atomic operations on compute shader shared variables. 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 | 4 ++++ dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02df3f0..5fa34e5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -150,6 +150,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"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_storage_buffer_object", ARB_SHADER_STORAGE_BUFFER_OBJECT}, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shading_language_420pack", ARB_SHADING_LANGUAGE_420PACK }, @@ -2832,6 +2833,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glUniformMatrix4fvARB) USE_GL_FUNC(glUseProgramObjectARB) USE_GL_FUNC(glValidateProgramARB) + /* GL_ARB_shader_storage_buffer_object */ + USE_GL_FUNC(glShaderStorageBlockBinding) /* GL_ARB_sync */ USE_GL_FUNC(glClientWaitSync) USE_GL_FUNC(glDeleteSync) @@ -3774,6 +3777,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, + {ARB_SHADER_STORAGE_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 3)}, {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_BUFFER_RANGE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e5dd567..d6bb622 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6613,6 +6613,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, 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_SHADER_STORAGE_BUFFER_OBJECT]) + shader_addline(buffer, "#extension GL_ARB_shader_storage_buffer_object : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) shader_addline(buffer, "#extension GL_ARB_shading_language_420pack : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 396f93f..fa5985c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -83,6 +83,7 @@ enum wined3d_gl_extension ARB_SHADER_BIT_ENCODING, ARB_SHADER_IMAGE_LOAD_STORE, ARB_SHADER_IMAGE_SIZE, + ARB_SHADER_STORAGE_BUFFER_OBJECT, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADING_LANGUAGE_420PACK,

1 0

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

02 Mar '17

Module: wine Branch: master Commit: d853eaedaee9f2757c340113f3974768604a504d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d853eaedaee9f2757c340113f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:29 2017 +0100 wined3d: Implement SM5 sync 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 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 61865c1..e5dd567 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5338,6 +5338,27 @@ static void shader_glsl_store_raw_structured(const struct wined3d_shader_instruc string_buffer_release(priv->string_buffers, address); } +static void shader_glsl_sync(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + unsigned int sync_flags = ins->flags; + + if (sync_flags & WINED3DSSF_THREAD_GROUP) + { + shader_addline(buffer, "barrier();\n"); + sync_flags &= ~(WINED3DSSF_THREAD_GROUP | WINED3DSSF_GROUP_SHARED_MEMORY); + } + + if (sync_flags & WINED3DSSF_GROUP_SHARED_MEMORY) + { + shader_addline(buffer, "memoryBarrierShared();\n"); + sync_flags &= ~WINED3DSSF_GROUP_SHARED_MEMORY; + } + + if (sync_flags) + FIXME("Unhandled sync flags %#x.\n", sync_flags); +} + static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; @@ -9677,7 +9698,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_SYNC */ shader_glsl_sync, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem, /* WINED3DSIH_TEXBEML */ shader_glsl_texbem,

1 0

Józef Kucia : wined3d: Add support for store_{raw, structured} on thread group shared memory.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 5b43b83539e7ac76ef1034a85fd977bddfe81fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b43b83539e7ac76ef1034a85… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:28 2017 +0100 wined3d: Add support for store_{raw, structured} 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 | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 51deae0..61865c1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5278,30 +5278,44 @@ static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) image_coord_param.param_str, image_data_param.param_str); } -static void shader_glsl_store_buffer(const struct wined3d_shader_instruction *ins) +static void shader_glsl_store_raw_structured(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param structure_idx, offset, data; + unsigned int i, resource_idx, stride, src_idx = 0; struct wined3d_string_buffer *address; - unsigned int i, uav_idx, src_idx = 0; DWORD write_mask; + BOOL is_tgsm; - uav_idx = ins->dst[0].reg.idx[0].offset; - if (uav_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + resource_idx = ins->dst[0].reg.idx[0].offset; + is_tgsm = ins->dst[0].reg.type == WINED3DSPR_GROUPSHAREDMEM; + if (is_tgsm) { - ERR("Invalid UAV index %u.\n", uav_idx); - return; + if (resource_idx >= reg_maps->tgsm_count) + { + ERR("Invalid TGSM index %u.\n", resource_idx); + return; + } + stride = reg_maps->tgsm[resource_idx].stride; + } + else + { + if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", resource_idx); + return; + } + stride = reg_maps->uav_resource_info[resource_idx].stride; } address = string_buffer_get(priv->string_buffers); if (ins->handler_idx == WINED3DSIH_STORE_STRUCTURED) { shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &structure_idx); - shader_addline(address, "%s * %u + ", structure_idx.param_str, - reg_maps->uav_resource_info[uav_idx].stride); + shader_addline(address, "%s * %u + ", structure_idx.param_str, stride); } shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &offset); shader_addline(address, "%s / 4", offset.param_str); @@ -5313,8 +5327,12 @@ static void shader_glsl_store_buffer(const struct wined3d_shader_instruction *in shader_glsl_add_src_param(ins, &ins->src[src_idx], write_mask, &data); - shader_addline(buffer, "imageStore(%s_image%u, %s + %u, uvec4(%s, 0, 0, 0));\n", - prefix, uav_idx, address->buffer, i, data.param_str); + if (is_tgsm) + shader_addline(buffer, "%s_g%u[%s + %u] = %s;\n", + prefix, resource_idx, address->buffer, i, data.param_str); + else + shader_addline(buffer, "imageStore(%s_image%u, %s + %u, uvec4(%s, 0, 0, 0));\n", + prefix, resource_idx, address->buffer, i, data.param_str); } string_buffer_release(priv->string_buffers, address); @@ -9653,8 +9671,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SQRT */ shader_glsl_map2gl, - /* WINED3DSIH_STORE_RAW */ shader_glsl_store_buffer, - /* WINED3DSIH_STORE_STRUCTURED */ shader_glsl_store_buffer, + /* WINED3DSIH_STORE_RAW */ shader_glsl_store_raw_structured, + /* WINED3DSIH_STORE_STRUCTURED */ shader_glsl_store_raw_structured, /* WINED3DSIH_STORE_UAV_TYPED */ shader_glsl_store_uav, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWAPC */ NULL,

1 0

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

02 Mar '17

Module: wine Branch: master Commit: 63b1ad59a39433ba4a4f0a75d984bfba13890a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b1ad59a39433ba4a4f0a75d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:27 2017 +0100 wined3d: Add support for atomic 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 | 83 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 64 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b613319..51deae0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4971,34 +4971,66 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) enum wined3d_shader_resource_type resource_type; struct wined3d_string_buffer *address; enum wined3d_data_type data_type; - unsigned int uav_idx, stride; + unsigned int resource_idx, stride; + const char *op, *resource; DWORD coord_mask; - const char *op; + BOOL is_tgsm; - uav_idx = ins->dst[is_imm_instruction].reg.idx[0].offset; - resource_type = reg_maps->uav_resource_info[uav_idx].type; - if (resource_type >= ARRAY_SIZE(resource_type_info)) + resource_idx = ins->dst[is_imm_instruction].reg.idx[0].offset; + is_tgsm = ins->dst[is_imm_instruction].reg.type == WINED3DSPR_GROUPSHAREDMEM; + if (is_tgsm) { - ERR("Unexpected resource type %#x.\n", resource_type); - return; + if (resource_idx >= reg_maps->tgsm_count) + { + ERR("Invalid TGSM index %u.\n", resource_idx); + return; + } + resource = "g"; + data_type = WINED3D_DATA_UINT; + coord_mask = 1; + stride = reg_maps->tgsm[resource_idx].stride; + } + else + { + if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", resource_idx); + return; + } + resource_type = reg_maps->uav_resource_info[resource_idx].type; + if (resource_type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + return; + } + resource = "image"; + data_type = reg_maps->uav_resource_info[resource_idx].data_type; + coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + stride = reg_maps->uav_resource_info[resource_idx].stride; } - data_type = reg_maps->uav_resource_info[uav_idx].data_type; - coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; - stride = reg_maps->uav_resource_info[uav_idx].stride; switch (ins->handler_idx) { case WINED3DSIH_ATOMIC_AND: case WINED3DSIH_IMM_ATOMIC_AND: - op = "imageAtomicAnd"; + if (is_tgsm) + op = "atomicAnd"; + else + op = "imageAtomicAnd"; break; case WINED3DSIH_ATOMIC_CMP_STORE: case WINED3DSIH_IMM_ATOMIC_CMP_EXCH: - op = "imageAtomicCompSwap"; + if (is_tgsm) + op = "atomicCompSwap"; + else + op = "imageAtomicCompSwap"; break; case WINED3DSIH_ATOMIC_IADD: case WINED3DSIH_IMM_ATOMIC_IADD: - op = "imageAtomicAdd"; + if (is_tgsm) + op = "atomicAdd"; + else + op = "imageAtomicAdd"; break; case WINED3DSIH_ATOMIC_IMAX: case WINED3DSIH_IMM_ATOMIC_IMAX: @@ -5020,7 +5052,10 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) break; case WINED3DSIH_ATOMIC_OR: case WINED3DSIH_IMM_ATOMIC_OR: - op = "imageAtomicOr"; + if (is_tgsm) + op = "atomicOr"; + else + op = "imageAtomicOr"; break; case WINED3DSIH_ATOMIC_UMAX: case WINED3DSIH_IMM_ATOMIC_UMAX: @@ -5042,10 +5077,16 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) break; case WINED3DSIH_ATOMIC_XOR: case WINED3DSIH_IMM_ATOMIC_XOR: - op = "imageAtomicXor"; + if (is_tgsm) + op = "atomicXor"; + else + op = "imageAtomicXor"; break; case WINED3DSIH_IMM_ATOMIC_EXCH: - op = "imageAtomicExchange"; + if (is_tgsm) + op = "atomicExchange"; + else + op = "imageAtomicExchange"; break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -5063,15 +5104,19 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) { shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &offset); string_buffer_sprintf(address, "%s", offset.param_str); - if (reg_maps->uav_resource_info[uav_idx].flags & WINED3D_VIEW_BUFFER_RAW) + if (reg_maps->uav_resource_info[resource_idx].flags & WINED3D_VIEW_BUFFER_RAW) shader_addline(address, "/ 4"); } if (is_imm_instruction) shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], data_type); - shader_addline(buffer, "%s(%s_image%u, %s, ", - op, shader_glsl_get_prefix(version->type), uav_idx, address->buffer); + if (is_tgsm) + shader_addline(buffer, "%s(%s_%s%u[%s], ", + op, shader_glsl_get_prefix(version->type), resource, resource_idx, address->buffer); + else + shader_addline(buffer, "%s(%s_%s%u, %s, ", + op, shader_glsl_get_prefix(version->type), resource, resource_idx, address->buffer); shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &data, data_type); shader_addline(buffer, "%s", data.param_str);

1 0

Józef Kucia : wined3d: Rename shader_glsl_ld_buffer() to shader_glsl_ld_raw_structured().
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 27a55f8f49243f0eef0e780b3f10b83596041d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a55f8f49243f0eef0e780b3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 2 00:55:26 2017 +0100 wined3d: Rename shader_glsl_ld_buffer() to shader_glsl_ld_raw_structured(). 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c65bc69..b613319 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5122,7 +5122,7 @@ static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle); } -static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) +static void shader_glsl_ld_raw_structured(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); const struct wined3d_shader_src_param *src = &ins->src[ins->src_count - 1]; @@ -9556,8 +9556,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, /* WINED3DSIH_LD2DMS */ NULL, - /* WINED3DSIH_LD_RAW */ shader_glsl_ld_buffer, - /* WINED3DSIH_LD_STRUCTURED */ shader_glsl_ld_buffer, + /* WINED3DSIH_LD_RAW */ shader_glsl_ld_raw_structured, + /* WINED3DSIH_LD_STRUCTURED */ shader_glsl_ld_raw_structured, /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOD */ NULL,

1 0

Huw Davies : dsound: Pass sample count to the normfunction.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: e6f8f136fa557d282f44654be509573cb45a831f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f8f136fa557d282f44654be… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 16:01:00 2017 +0000 dsound: Pass sample count to the normfunction. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 27 ++++++++++++--------------- dlls/dsound/mixer.c | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 0c9a34b..6887bae 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -286,10 +286,10 @@ void mixieee32(float *src, float *dst, unsigned samples) *(dst++) += *(src++); } -static void norm8(float *src, unsigned char *dst, unsigned len) +static void norm8(float *src, unsigned char *dst, unsigned samples) { - TRACE("%p - %p %d\n", src, dst, len); - while (len--) + TRACE("%p - %p %d\n", src, dst, samples); + while (samples--) { *dst = f_to_8(*src); ++dst; @@ -297,11 +297,10 @@ static void norm8(float *src, unsigned char *dst, unsigned len) } } -static void norm16(float *src, SHORT *dst, unsigned len) +static void norm16(float *src, SHORT *dst, unsigned samples) { - TRACE("%p - %p %d\n", src, dst, len); - len /= 2; - while (len--) + TRACE("%p - %p %d\n", src, dst, samples); + while (samples--) { *dst = f_to_16(*src); ++dst; @@ -309,11 +308,10 @@ static void norm16(float *src, SHORT *dst, unsigned len) } } -static void norm24(float *src, BYTE *dst, unsigned len) +static void norm24(float *src, BYTE *dst, unsigned samples) { - TRACE("%p - %p %d\n", src, dst, len); - len /= 3; - while (len--) + TRACE("%p - %p %d\n", src, dst, samples); + while (samples--) { LONG t = f_to_24(*src); dst[0] = (t >> 8) & 0xFF; @@ -324,11 +322,10 @@ static void norm24(float *src, BYTE *dst, unsigned len) } } -static void norm32(float *src, INT *dst, unsigned len) +static void norm32(float *src, INT *dst, unsigned samples) { - TRACE("%p - %p %d\n", src, dst, len); - len /= 4; - while (len--) + TRACE("%p - %p %d\n", src, dst, samples); + while (samples--) { *dst = f_to_32(*src); ++dst; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 049a345..1180594 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -716,7 +716,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* do the mixing */ DSOUND_MixToPrimary(device, (float*)device->buffer, frames, &all_stopped); - device->normfunction(device->buffer, buffer, frames * block); + device->normfunction(device->buffer, buffer, frames * device->pwfx->nChannels); } hr = IAudioRenderClient_ReleaseBuffer(device->render, frames, 0);

1 0

Huw Davies : dsound: Use frame rather than byte counts to clarify the mixing.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 134b684fd90423490e7eb2395db88df683d8fdc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134b684fd90423490e7eb2395… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 16:00:59 2017 +0000 dsound: Use frame rather than byte counts to clarify the mixing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 93 ++++++++++++++++++++------------------------ dlls/dsound/primary.c | 8 ++-- 3 files changed, 47 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=134b684fd90423490e7eb…

1 0

Huw Davies : dsound: Don' t propagate writepos in the non-WRITEPRIMARY case - it's unused.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 7a27cc89aae052ebac3a88f590610791b15c03bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a27cc89aae052ebac3a88f59… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 16:00:58 2017 +0000 dsound: Don't propagate writepos in the non-WRITEPRIMARY case - it's unused. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/mixer.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 2550753..174d56c 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -487,10 +487,9 @@ static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames) * (and it is not looping). * * dsb = the secondary buffer to mix from - * writepos = position (offset) in device buffer to write at * fraglen = number of bytes to mix */ -static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD writepos, DWORD fraglen) +static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD fraglen) { INT len = fraglen; float *ibuf; @@ -498,7 +497,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, UINT frames = fraglen / dsb->device->pwfx->nBlockAlign; TRACE("sec_mixpos=%d/%d\n", dsb->sec_mixpos, dsb->buflen); - TRACE("(%p,%d,%d)\n",dsb,writepos,fraglen); + TRACE("(%p,%d)\n",dsb,fraglen); if (len % dsb->device->pwfx->nBlockAlign) { INT nBlockAlign = dsb->device->pwfx->nBlockAlign; @@ -532,18 +531,16 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, * * dsb = the secondary buffer * playpos = the current play position in the device buffer (primary buffer) - * writepos = the current safe-to-write position in the device buffer * mixlen = the maximum number of bytes in the primary buffer to mix, from the * current writepos. * * Returns: the number of bytes beyond the writepos that were mixed. */ -static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD writepos, DWORD mixlen) +static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD mixlen) { DWORD primary_done = 0; - TRACE("(%p,%d,%d)\n",dsb,writepos,mixlen); - TRACE("writepos=%d, mixlen=%d\n", writepos, mixlen); + TRACE("(%p,%d)\n",dsb,mixlen); TRACE("looping=%d, leadin=%d\n", dsb->playflags, dsb->leadin); /* If leading in, only mix about 20 ms, and 'skip' mixing the rest, for more fluid pointer advancement */ @@ -552,7 +549,6 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD if (mixlen > 2 * dsb->device->fraglen) { primary_done = mixlen - 2 * dsb->device->fraglen; mixlen = 2 * dsb->device->fraglen; - writepos += primary_done; dsb->sec_mixpos += (primary_done / dsb->device->pwfx->nBlockAlign) * dsb->pwfx->nBlockAlign * dsb->freqAdjustNum / dsb->freqAdjustDen; } @@ -565,7 +561,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD /* First try to mix to the end of the buffer if possible * Theoretically it would allow for better optimization */ - primary_done += DSOUND_MixInBuffer(dsb, mix_buffer, writepos, mixlen); + primary_done += DSOUND_MixInBuffer(dsb, mix_buffer, mixlen); TRACE("total mixed data=%d\n", primary_done); @@ -577,7 +573,6 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD * For a DirectSoundDevice, go through all the currently playing buffers and * mix them in to the device buffer. * - * writepos = the current safe-to-write position in the primary buffer * mixlen = the maximum amount to mix into the primary buffer * (beyond the current writepos) * all_stopped = reports back if all buffers have stopped @@ -585,7 +580,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD * Returns: the length beyond the writepos that was mixed to. */ -static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buffer, DWORD writepos, DWORD mixlen, BOOL *all_stopped) +static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buffer, DWORD mixlen, BOOL *all_stopped) { INT i; IDirectSoundBufferImpl *dsb; @@ -593,7 +588,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff /* unless we find a running buffer, all have stopped */ *all_stopped = TRUE; - TRACE("(%d,%d)\n", writepos, mixlen); + TRACE("(%d)\n", mixlen); for (i = 0; i < device->nrofbuffers; i++) { dsb = device->buffers[i]; @@ -613,7 +608,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff dsb->state = STATE_PLAYING; /* mix next buffer into the main buffer */ - DSOUND_MixOne(dsb, mix_buffer, writepos, mixlen); + DSOUND_MixOne(dsb, mix_buffer, mixlen); *all_stopped = FALSE; } @@ -671,7 +666,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes) */ static void DSOUND_PerformMix(DirectSoundDevice *device) { - UINT32 pad, maxq, writepos; + UINT32 pad, maxq; DWORD block; HRESULT hr; @@ -701,8 +696,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (maxq > device->fraglen * 3) maxq = device->fraglen * 3; - writepos = (device->playpos + pad) % device->buflen; - if (device->priolevel != DSSCL_WRITEPRIMARY) { BOOL all_stopped = FALSE; int nfiller; @@ -726,12 +719,12 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) memset(buffer, nfiller, maxq); if (!device->normfunction) - DSOUND_MixToPrimary(device, buffer, writepos, maxq, &all_stopped); + DSOUND_MixToPrimary(device, buffer, maxq, &all_stopped); else { memset(device->buffer, nfiller, device->buflen); /* do the mixing */ - DSOUND_MixToPrimary(device, (float*)device->buffer, writepos, maxq, &all_stopped); + DSOUND_MixToPrimary(device, (float*)device->buffer, maxq, &all_stopped); device->normfunction(device->buffer, buffer, maxq); } @@ -742,6 +735,8 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) device->pad += maxq; } else if (!device->stopped) { + DWORD writepos = (device->playpos + pad) % device->buflen; + if (maxq > device->buflen) maxq = device->buflen; if (writepos + maxq > device->buflen) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017