wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Zhiyi Zhang : d2d1: Use newer blend options in d2d_device_context_SetTarget() for bitmaps of D2D1_ALPHA_MODE_IGNORE.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 6556ed2058219ab889d9361d2058b8f84861ff46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6556ed2058219ab889d9361d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 11 14:31:55 2022 +0800 d2d1: Use newer blend options in d2d_device_context_SetTarget() for bitmaps of D2D1_ALPHA_MODE_IGNORE. When bitmap alpha mode is D2D1_ALPHA_MODE_IGNORE, D3D11_BLEND_ZERO is used for SrcBlendAlpha and D3D11_BLEND_ONE for DestBlendAlpha on Win7. However, tests show that D3D11_BLEND_ONE is used for SrcBlendAlpha and D3D11_BLEND_INV_SRC_ALPHA for DestBlendAlpha on Win8+. The patch changes d2d_device_context_SetTarget() to use the Win8+ behaviour. Fix PowerPoint 2016 slideshow artifacts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 12 ++---------- dlls/d2d1/tests/d2d1.c | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 47da411f3b6..ea38ca41c8c 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2069,16 +2069,8 @@ static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *i blend_desc.RenderTarget[0].SrcBlend = D3D11_BLEND_ONE; blend_desc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_ALPHA; blend_desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD; - if (context->desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_IGNORE) - { - blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ZERO; - blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ONE; - } - else - { - blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE; - blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA; - } + blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE; + blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA; blend_desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD; blend_desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; if (FAILED(hr = ID3D11Device1_CreateBlendState(context->d3d_device, &blend_desc, &context->bs))) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7c54f365e06..d1e8b97ed7d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4585,7 +4585,6 @@ static void test_alpha_mode(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_surface(&ctx, "e7ee77e89745fa5d195fd78bd398738330cfcde8"); match2 = compare_surface(&ctx, "4855c7c082c8ede364cf6e2dcde83f95b88aecbe"); - todo_wine ok(match || broken(match2) /* Win7 TestBots */, "Surface does not match.\n"); IDXGISurface_Release(ctx.surface); ctx.surface = surface;

1 0

Zhiyi Zhang : d2d1/tests: Test d2d_device_context_SetTarget() with bitmaps of D2D1_ALPHA_MODE_IGNORE.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: fe4c187a7cbe2e0096057ca2221e944a277f64b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe4c187a7cbe2e0096057ca2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 11 14:31:47 2022 +0800 d2d1/tests: Test d2d_device_context_SetTarget() with bitmaps of D2D1_ALPHA_MODE_IGNORE. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3ade9634069..7c54f365e06 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4341,18 +4341,22 @@ static void test_bitmap_formats(BOOL d3d11) static void test_alpha_mode(BOOL d3d11) { D2D1_RENDER_TARGET_PROPERTIES rt_desc; + D2D1_BITMAP_PROPERTIES1 bitmap_desc1; D2D1_BITMAP_PROPERTIES bitmap_desc; ID2D1SolidColorBrush *color_brush; ID2D1BitmapBrush *bitmap_brush; struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + ID2D1Bitmap1 *bitmap1; ID2D1RenderTarget *rt; + IDXGISurface *surface; ID2D1Bitmap *bitmap; D2D1_COLOR_F color; + BOOL match, match2; D2D1_RECT_F rect; D2D1_SIZE_U size; ULONG refcount; HRESULT hr; - BOOL match; static const DWORD bitmap_data[] = { @@ -4546,8 +4550,50 @@ static void test_alpha_mode(BOOL d3d11) refcount = ID2D1Bitmap_Release(bitmap); ok(refcount == 1, "Bitmap has %lu references left.\n", refcount); - ID2D1SolidColorBrush_Release(color_brush); ID2D1BitmapBrush_Release(bitmap_brush); + + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_size_u(&size, 4, 4); + memset(&bitmap_desc1, 0, sizeof(bitmap_desc1)); + bitmap_desc1.dpiX = 96.0f; + bitmap_desc1.dpiY = 96.0f; + bitmap_desc1.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc1.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc1.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + hr = ID2D1DeviceContext_CreateBitmap(context, size, bitmap_data, 4 * sizeof(*bitmap_data), + &bitmap_desc1, &bitmap1); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1DeviceContext_BeginDraw(context); + ID2D1DeviceContext_SetTarget(context, (ID2D1Image *)bitmap1); + set_rect(&rect, 0.0f, 2.0f, 1.0f, 2.0f); + ID2D1SolidColorBrush_SetOpacity(color_brush, 1.0f); + ID2D1DeviceContext_FillRectangle(context, &rect, (ID2D1Brush *)color_brush); + set_rect(&rect, 1.0f, 2.0f, 3.0f, 3.0f); + ID2D1SolidColorBrush_SetOpacity(color_brush, 0.75f); + ID2D1DeviceContext_FillRectangle(context, &rect, (ID2D1Brush *)color_brush); + set_rect(&rect, 3.0f, 2.0f, 3.0f, 3.0f); + ID2D1SolidColorBrush_SetOpacity(color_brush, 0.25f); + ID2D1DeviceContext_FillRectangle(context, &rect, (ID2D1Brush *)color_brush); + hr = ID2D1DeviceContext_EndDraw(context, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + surface = ctx.surface; + hr = ID2D1Bitmap1_GetSurface(bitmap1, &ctx.surface); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "e7ee77e89745fa5d195fd78bd398738330cfcde8"); + match2 = compare_surface(&ctx, "4855c7c082c8ede364cf6e2dcde83f95b88aecbe"); + todo_wine + ok(match || broken(match2) /* Win7 TestBots */, "Surface does not match.\n"); + IDXGISurface_Release(ctx.surface); + ctx.surface = surface; + ID2D1DeviceContext_SetTarget(context, NULL); + + ID2D1Bitmap1_Release(bitmap1); + ID2D1DeviceContext_Release(context); + ID2D1SolidColorBrush_Release(color_brush); ID2D1RenderTarget_Release(rt); release_test_context(&ctx); }

1 0

Zhiyi Zhang : d2d1: Release bitmap on d2d_device_context_SetTarget() error path.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: d0902b7c8e2aba00a2f922dc456bf93191d5286f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0902b7c8e2aba00a2f922dc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 11 14:31:41 2022 +0800 d2d1: Release bitmap on d2d_device_context_SetTarget() error path. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index ce74d7c1582..47da411f3b6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2051,6 +2051,7 @@ static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *i if (!(bitmap_impl->options & D2D1_BITMAP_OPTIONS_TARGET)) { + ID2D1Bitmap_Release(bitmap); d2d_device_context_set_error(context, D2DERR_INVALID_TARGET); return; }

1 0

Matteo Bruni : wined3d: Use list_empty() in shader_glsl_destroy().
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 32799848e3b100f9a19a35f45a453cd3009bebb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32799848e3b100f9a19a35f4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 10 19:56:44 2022 -0600 wined3d: Use list_empty() in shader_glsl_destroy(). Signed-off-by: Zebediah Figura <zfigura(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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index acecb2e9ce5..f79fa1571e6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10818,7 +10818,7 @@ static void shader_glsl_destroy(struct wined3d_shader *shader) TRACE("Deleting linked programs.\n"); linked_programs = &shader->linked_programs; - if (linked_programs->next) + if (!list_empty(linked_programs)) { struct glsl_shader_prog_link *entry, *entry2; UINT i;

1 0

Zebediah Figura : d3d11: Report support for ConstantBufferPartialUpdate.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: a37b16e4afb59abe73288270d7da7c57bc5ac078 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37b16e4afb59abe73288270… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 10 19:22:46 2022 -0600 d3d11: Report support for ConstantBufferPartialUpdate. Microsoft is not exactly clear what this means, but it seems likely it refers to the ability to bind a range of a constant buffer [i.e. with ID3D11DeviceContext::*SetConstantBuffers1()] rather than the whole buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7d2c2636f4b..e73d6726f5d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4087,7 +4087,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 options->FlagsForUpdateAndCopySeenByDriver = FALSE; options->ClearView = FALSE; options->CopyWithOverlap = FALSE; - options->ConstantBufferPartialUpdate = FALSE; + options->ConstantBufferPartialUpdate = TRUE; options->ConstantBufferOffsetting = TRUE; options->MapNoOverwriteOnDynamicConstantBuffer = TRUE; options->MapNoOverwriteOnDynamicBufferSRV = TRUE;

1 0

Zebediah Figura : d3d11: Report support for MapNoOverwriteOnDynamicConstantBuffer.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 1ca215ea04c2c592d4ff0f708ea558db7464d684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca215ea04c2c592d4ff0f70… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 10 19:22:45 2022 -0600 d3d11: Report support for MapNoOverwriteOnDynamicConstantBuffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 577a3de5bf8..7d2c2636f4b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4089,7 +4089,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 options->CopyWithOverlap = FALSE; options->ConstantBufferPartialUpdate = FALSE; options->ConstantBufferOffsetting = TRUE; - options->MapNoOverwriteOnDynamicConstantBuffer = FALSE; + options->MapNoOverwriteOnDynamicConstantBuffer = TRUE; options->MapNoOverwriteOnDynamicBufferSRV = TRUE; options->MultisampleRTVWithForcedSampleCountOne = FALSE; options->SAD4ShaderInstructions = FALSE;

1 0

Matteo Bruni : d3d11: Report support for MapNoOverwriteOnDynamicBufferSRV.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 3dc960c8cc18cb434ed985439a68427f99e65b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dc960c8cc18cb434ed98543… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 10 19:22:44 2022 -0600 d3d11: Report support for MapNoOverwriteOnDynamicBufferSRV. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index cda1a97f974..577a3de5bf8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4090,7 +4090,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 options->ConstantBufferPartialUpdate = FALSE; options->ConstantBufferOffsetting = TRUE; options->MapNoOverwriteOnDynamicConstantBuffer = FALSE; - options->MapNoOverwriteOnDynamicBufferSRV = FALSE; + options->MapNoOverwriteOnDynamicBufferSRV = TRUE; options->MultisampleRTVWithForcedSampleCountOne = FALSE; options->SAD4ShaderInstructions = FALSE; options->ExtendedDoublesShaderInstructions = FALSE;

1 0

Zebediah Figura : wined3d: Prevent buildup of retired OpenGL buffer objects' memory.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: ee12556960e30fc22f276d2de2833e63be90cee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee12556960e30fc22f276d2d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 10 17:56:54 2022 -0600 wined3d: Prevent buildup of retired OpenGL buffer objects' memory. Analogous to d71358f5e9e20f4a99354a0192b67009019b78d3 for the Vulkan backend. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52574 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index bb186706ad5..8ac5c28c892 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2713,6 +2713,7 @@ void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_ device_gl->completed_fence_id = 0; device_gl->current_fence_id = 1; } + device_gl->retired_bo_size = 0; wined3d_context_gl_cleanup_resources(context_gl); } @@ -3123,15 +3124,26 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) { + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); const struct wined3d_gl_info *gl_info = context_gl->gl_info; TRACE("context_gl %p, bo %p.\n", context_gl, bo); if (bo->memory) { + unsigned int order = bo->memory->order; + if (bo->b.map_ptr) wined3d_allocator_chunk_gl_unmap(wined3d_allocator_chunk_gl(bo->memory->chunk), context_gl); wined3d_context_gl_destroy_allocator_block(context_gl, bo->memory, bo->command_fence_id); + + if (bo->command_fence_id == device_gl->current_fence_id) + { + device_gl->retired_bo_size += WINED3D_ALLOCATOR_CHUNK_SIZE >> order; + if (device_gl->retired_bo_size > WINED3D_RETIRED_BO_SIZE_THRESHOLD) + wined3d_context_gl_submit_command_fence(context_gl); + } + bo->id = 0; return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e46b6dfb9e0..e0a60a5807d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4154,6 +4154,7 @@ struct wined3d_device_gl struct wined3d_allocator allocator; uint64_t completed_fence_id; uint64_t current_fence_id; + uint64_t retired_bo_size; struct wined3d_retired_block_gl {

1 0

Zebediah Figura : wined3d: Trace GL buffer object creation more accurately.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 94c08e6dd1e72083fb9b42874e659b79978640af URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c08e6dd1e72083fb9b4287… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 10 17:07:06 2022 -0600 wined3d: Trace GL buffer object creation more accurately. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4f356bdc7ec..d14b40d8e3e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1080,6 +1080,7 @@ static struct wined3d_allocator_block *wined3d_device_gl_allocate_memory(struct *id = wined3d_allocator_chunk_gl(block->chunk)->gl_buffer; wined3d_device_gl_allocator_unlock(device_gl); + TRACE("Allocated offset %Iu from buffer object %u.\n", block->offset, *id); return block; } @@ -1144,6 +1145,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win checkGLcall("buffer object creation"); return false; } + TRACE("Created buffer object %u.\n", id); wined3d_context_gl_bind_bo(context_gl, binding, id); if (!coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) @@ -1158,7 +1160,6 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win checkGLcall("buffer object creation"); } - TRACE("Created buffer object %u.\n", id); bo->id = id; bo->memory = memory; bo->size = size;

1 0

Huw Davies : winealsa: Move set_volumes to the unixlib.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 253b1325b4a8ffc02e0c05e336c201ae8bbb3705 URL: https://source.winehq.org/git/wine.git/?a=commit;h=253b1325b4a8ffc02e0c05e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 10 08:20:06 2022 +0000 winealsa: Move set_volumes to the unixlib. 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/winealsa.drv/alsa.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 12 ++++++----- dlls/winealsa.drv/unixlib.h | 46 +++++++++------------------------------- 3 files changed, 67 insertions(+), 41 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 365f5637b20..c199a2e603d 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -45,6 +45,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa); +struct alsa_stream +{ + snd_pcm_t *pcm_handle; + snd_pcm_uframes_t alsa_bufsize_frames, alsa_period_frames, safe_rewind_frames; + snd_pcm_hw_params_t *hw_params; /* does not hold state between calls */ + snd_pcm_format_t alsa_format; + + LARGE_INTEGER last_period_time; + + WAVEFORMATEX *fmt; + DWORD flags; + AUDCLNT_SHAREMODE share; + EDataFlow flow; + HANDLE event; + + BOOL need_remapping; + int alsa_channels; + int alsa_channel_map[32]; + + BOOL started, please_quit; + REFERENCE_TIME mmdev_period_rt; + UINT64 written_frames, last_pos_frames; + UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; + snd_pcm_uframes_t remapping_buf_frames; + UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ + UINT32 wri_offs_frames; /* where to write fresh data in local_buffer */ + UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ + UINT32 vol_adjusted_frames; /* Frames we've already adjusted the volume of but didn't write yet */ + UINT32 data_in_alsa_frames; + + BYTE *local_buffer, *tmp_buffer, *remapping_buf, *silence_buf; + LONG32 getbuf_last; /* <0 when using tmp_buffer */ + float *vols; + + pthread_mutex_t lock; +}; + #define EXTRA_SAFE_RT 40000 static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', @@ -2162,6 +2199,18 @@ static NTSTATUS get_position(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS set_volumes(void *args) +{ + struct set_volumes_params *params = args; + struct alsa_stream *stream = params->stream; + unsigned int i; + + for(i = 0; i < stream->fmt->nChannels; i++) + stream->vols[i] = params->volumes[i] * params->session_volumes[i] * params->master_volume; + + return STATUS_SUCCESS; +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -2213,6 +2262,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_next_packet_size, get_frequency, get_position, + set_volumes, set_event_handle, is_started, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0f6a30e0f45..c2ec3dd54af 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -334,12 +334,14 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) static void set_stream_volumes(ACImpl *This) { - struct alsa_stream *stream = This->stream; - unsigned int i; + struct set_volumes_params params; + + params.stream = This->stream; + params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); + params.volumes = This->vols; + params.session_volumes = This->session->channel_vols; - for(i = 0; i < stream->fmt->nChannels; i++) - stream->vols[i] = This->session->mute ? 0.0f : - This->vols[i] * This->session->channel_vols[i] * This->session->master_vol; + ALSA_CALL(set_volumes, &params); } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index b73f40c8282..4326f79a50b 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -18,42 +18,7 @@ #include "audioclient.h" -struct alsa_stream -{ - snd_pcm_t *pcm_handle; - snd_pcm_uframes_t alsa_bufsize_frames, alsa_period_frames, safe_rewind_frames; - snd_pcm_hw_params_t *hw_params; /* does not hold state between calls */ - snd_pcm_format_t alsa_format; - - LARGE_INTEGER last_period_time; - - WAVEFORMATEX *fmt; - DWORD flags; - AUDCLNT_SHAREMODE share; - EDataFlow flow; - HANDLE event; - - BOOL need_remapping; - int alsa_channels; - int alsa_channel_map[32]; - - BOOL started, please_quit; - REFERENCE_TIME mmdev_period_rt; - UINT64 written_frames, last_pos_frames; - UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; - snd_pcm_uframes_t remapping_buf_frames; - UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ - UINT32 wri_offs_frames; /* where to write fresh data in local_buffer */ - UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ - UINT32 vol_adjusted_frames; /* Frames we've already adjusted the volume of but didn't write yet */ - UINT32 data_in_alsa_frames; - - BYTE *local_buffer, *tmp_buffer, *remapping_buf, *silence_buf; - LONG32 getbuf_last; /* <0 when using tmp_buffer */ - float *vols; - - pthread_mutex_t lock; -}; +struct alsa_stream; struct endpoint { @@ -209,6 +174,14 @@ struct get_position_params UINT64 *qpctime; }; +struct set_volumes_params +{ + struct alsa_stream *stream; + float master_volume; + const float *volumes; + const float *session_volumes; +}; + struct set_event_handle_params { struct alsa_stream *stream; @@ -243,6 +216,7 @@ enum alsa_funcs alsa_get_next_packet_size, alsa_get_frequency, alsa_get_position, + alsa_set_volumes, alsa_set_event_handle, alsa_is_started, };

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 2022