April 2022 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Invalidate framebuffer locations after setting up the renderpass.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 767b1c6d75417a210b2cec145738b803e12bf40a URL: https://source.winehq.org/git/wine.git/?a=commit;h=767b1c6d75417a210b2cec14… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 24 19:24:46 2022 +0300 wined3d: Invalidate framebuffer locations after setting up the renderpass. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 9891bf0b541..c3108811e2c 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3309,12 +3309,14 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_rendertarget_view *dsv; + struct wined3d_rendertarget_view *rtv; struct wined3d_buffer_vk *buffer_vk; VkSampleCountFlagBits sample_count; VkCommandBuffer vk_command_buffer; + unsigned int i, invalidate_rt = 0; struct wined3d_buffer *buffer; uint32_t null_buffer_binding; - unsigned int i; + bool invalidate_ds = false; if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER)) @@ -3331,15 +3333,13 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c context_vk->sample_count = 0; for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i) { - struct wined3d_rendertarget_view *rtv; - if (!(rtv = state->fb.render_targets[i]) || rtv->format->id == WINED3DFMT_NULL) continue; if (wined3d_blend_state_get_writemask(state->blend_state, i)) { wined3d_rendertarget_view_load_location(rtv, &context_vk->c, rtv->resource->draw_binding); - wined3d_rendertarget_view_invalidate_location(rtv, ~rtv->resource->draw_binding); + invalidate_rt |= (1 << i); } else { @@ -3360,7 +3360,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c else wined3d_rendertarget_view_prepare_location(dsv, &context_vk->c, dsv->resource->draw_binding); if (!state->depth_stencil_state || state->depth_stencil_state->desc.depth_write) - wined3d_rendertarget_view_invalidate_location(dsv, ~dsv->resource->draw_binding); + invalidate_ds = true; sample_count = max(1, wined3d_resource_get_sample_count(dsv->resource)); if (!context_vk->sample_count) @@ -3443,6 +3443,16 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c return VK_NULL_HANDLE; } + while (invalidate_rt) + { + i = wined3d_bit_scan(&invalidate_rt); + rtv = state->fb.render_targets[i]; + wined3d_rendertarget_view_invalidate_location(rtv, ~rtv->resource->draw_binding); + } + + if (invalidate_ds) + wined3d_rendertarget_view_invalidate_location(dsv, ~dsv->resource->draw_binding); + if (wined3d_context_vk_update_graphics_pipeline_key(context_vk, state, context_vk->graphics.vk_pipeline_layout, &null_buffer_binding) || !context_vk->graphics.vk_pipeline) {

1 0

Huw Davies : winecoreaudio: Pass a ptr to receive the stream in create_stream.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: c66d694c4b4ce23e83745acefc4c5480a08ce3a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c66d694c4b4ce23e83745ace… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 25 07:58:33 2022 +0100 winecoreaudio: Pass a ptr to receive the stream in create_stream. This matches the other drivers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 2 +- dlls/winecoreaudio.drv/mmdevdrv.c | 16 +++++++++------- dlls/winecoreaudio.drv/unixlib.h | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f242ebe54a8..5892a0e44f4 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -700,7 +700,7 @@ end: free(stream->fmt); free(stream); } else - params->stream = stream; + *params->stream = stream; return STATUS_SUCCESS; } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 128396fbe29..2ba4e7ee028 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -666,6 +666,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); struct release_stream_params release_params; struct create_stream_params params; + struct coreaudio_stream *stream; UINT32 i; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, @@ -734,10 +735,13 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.duration = duration; params.period = period; params.fmt = fmt; - params.stream = NULL; + params.stream = &stream; UNIX_CALL(create_stream, &params); - if(FAILED(params.result)) goto end; + if(FAILED(params.result)){ + LeaveCriticalSection(&g_sessions_lock); + return params.result; + } This->flags = flags; This->channel_count = fmt->nChannels; @@ -759,14 +763,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, end: if(FAILED(params.result)){ - if(params.stream){ - release_params.stream = params.stream; - UNIX_CALL(release_stream, &release_params); - } + release_params.stream = stream; + UNIX_CALL(release_stream, &release_params); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; }else{ - This->stream = params.stream; + This->stream = stream; set_stream_volumes(This, -1); } diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index bd9a5ce03bd..e48670ab2f0 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -46,7 +46,7 @@ struct create_stream_params REFERENCE_TIME period; const WAVEFORMATEX *fmt; HRESULT result; - struct coreaudio_stream *stream; + struct coreaudio_stream **stream; }; struct release_stream_params

1 0

Huw Davies : winecoreaudio: Use UINT64 handles to represent the stream.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 90e9379f2a84d678c1a91ae9f1b3f4f1f49b9d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90e9379f2a84d678c1a91ae9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 25 07:58:34 2022 +0100 winecoreaudio: Use UINT64 handles to represent the stream. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 39 +++++++++++++++++++++----------------- dlls/winecoreaudio.drv/mmdevdrv.c | 4 ++-- dlls/winecoreaudio.drv/unixlib.h | 36 +++++++++++++++++------------------ 3 files changed, 42 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90e9379f2a84d678c1a9…

1 0

Huw Davies : winecoreaudio: Limit Wow64 buffer allocations to 32-bit addresses.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: c4682a0893e3b8dc42d7438afc9fa9b8234302b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4682a0893e3b8dc42d7438a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 25 07:58:36 2022 +0100 winecoreaudio: Limit Wow64 buffer allocations to 32-bit addresses. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 955b7d2afaf..463a330eeda 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -615,6 +615,15 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni return S_OK; } +static ULONG_PTR zero_bits(void) +{ +#ifdef _WIN64 + return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; +#else + return 0; +#endif +} + static NTSTATUS create_stream(void *args) { struct create_stream_params *params = args; @@ -685,8 +694,8 @@ static NTSTATUS create_stream(void *args) } size = stream->bufsize_frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), + &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto end; } @@ -1371,7 +1380,7 @@ static NTSTATUS get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = params->frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; params->result = E_OUTOFMEMORY; @@ -1469,7 +1478,7 @@ static NTSTATUS get_capture_buffer(void *args) chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; if(!stream->tmp_buffer){ size = stream->period_frames * stream->fmt->nBlockAlign; - NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, MEM_COMMIT, PAGE_READWRITE); } *params->data = stream->tmp_buffer;

1 0

Rémi Bernon : windows.gaming.input: Implement ForceFeedbackMotor stub runtimeclass.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 69745cc12dbace5b8dc9f5218e36177f6f294baf URL: https://source.winehq.org/git/wine.git/?a=commit;h=69745cc12dbace5b8dc9f521… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 14:56:17 2022 +0200 windows.gaming.input: Implement ForceFeedbackMotor stub runtimeclass. And create it for RawGameController and RacingWheel motors. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 6 +- dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/controller.c | 11 +- dlls/windows.gaming.input/force_feedback.c | 227 +++++++++++++++++++++++++++++ dlls/windows.gaming.input/private.h | 3 + dlls/windows.gaming.input/provider.c | 16 ++ dlls/windows.gaming.input/provider.idl | 3 + dlls/windows.gaming.input/racing_wheel.c | 7 +- 8 files changed, 267 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69745cc12dbace5b8dc9…

1 0

Rémi Bernon : windows.gaming.input: Implement IForceFeedbackMotor_(get|put)_MasterGain.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: fec8aae2361bfe3ef934430397b491c8165564f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fec8aae2361bfe3ef9344303… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 14:56:19 2022 +0200 windows.gaming.input: Implement IForceFeedbackMotor_(get|put)_MasterGain. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 6 +---- dlls/windows.gaming.input/force_feedback.c | 37 ++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 9c9af8b6389..f9538f5f56d 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5063,7 +5063,6 @@ static void test_windows_gaming_input(void) .report_id = 6, .report_len = 2, .report_buf = {6, 0x7f}, - .todo = TRUE, }; static struct hid_expect expect_pause = { @@ -5306,15 +5305,12 @@ static void test_windows_gaming_input(void) gain = 12345.6; hr = IForceFeedbackMotor_get_MasterGain( motor, &gain ); - todo_wine ok( hr == S_OK, "get_MasterGain returned %#lx\n", hr ); - todo_wine ok( gain == 1.0, "got gain %f\n", gain ); set_hid_expect( file, &expect_set_gain, sizeof(expect_set_gain) ); hr = IForceFeedbackMotor_put_MasterGain( motor, 0.5 ); - todo_wine ok( hr == S_OK, "put_MasterGain returned %#lx\n", hr ); - wait_hid_expect_( __FILE__, __LINE__, file, 100, TRUE ); /* device gain reports are written asynchronously */ + wait_hid_expect( file, 100 ); /* device gain reports are written asynchronously */ enabled = FALSE; hr = IForceFeedbackMotor_get_IsEnabled( motor, &enabled ); diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 54742475e7b..6d4e533bc77 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -111,14 +111,43 @@ static HRESULT WINAPI motor_get_AreEffectsPaused( IForceFeedbackMotor *iface, BO static HRESULT WINAPI motor_get_MasterGain( IForceFeedbackMotor *iface, double *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct motor *impl = impl_from_IForceFeedbackMotor( iface ); + DIPROPDWORD gain = + { + .diph = + { + .dwSize = sizeof(DIPROPDWORD), + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + }, + }; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (FAILED(hr = IDirectInputDevice8_GetProperty( impl->device, DIPROP_FFGAIN, &gain.diph ))) *value = 1.; + else *value = gain.dwData / 10000.; + + return hr; } static HRESULT WINAPI motor_put_MasterGain( IForceFeedbackMotor *iface, double value ) { - FIXME( "iface %p, value %#I64x stub!\n", iface, *(UINT64 *)&value ); - return E_NOTIMPL; + struct motor *impl = impl_from_IForceFeedbackMotor( iface ); + DIPROPDWORD gain = + { + .diph = + { + .dwSize = sizeof(DIPROPDWORD), + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + }, + }; + + TRACE( "iface %p, value %f.\n", iface, value ); + + gain.dwData = 10000 * value; + return IDirectInputDevice8_SetProperty( impl->device, DIPROP_FFGAIN, &gain.diph ); } static HRESULT WINAPI motor_get_IsEnabled( IForceFeedbackMotor *iface, BOOLEAN *value )

1 0

Huw Davies : winemac: Use ULongToPtr() to cast format ids to void ptrs.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: fb0af5d9adae3ce751fc680d7bf47b53f94c207e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb0af5d9adae3ce751fc680d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 25 14:17:02 2022 +0100 winemac: Use ULongToPtr() to cast format ids to void ptrs. This avoids compiler warnings on 64-bit. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 70b087846e9..63c8bc76e75 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1514,7 +1514,7 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT if (!format->synthesized) { TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - CFSetAddValue(seen_formats, (void*)format->format_id); + CFSetAddValue(seen_formats, ULongToPtr(format->format_id)); formats[pos++] = format; } else if (format->natural_format && @@ -1523,7 +1523,7 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT TRACE("for type %s deferring synthesized formats because type %s is also present\n", debugstr_cf(type), debugstr_cf(format->natural_format->type)); } - else if (CFSetContainsValue(seen_formats, (void*)format->format_id)) + else if (CFSetContainsValue(seen_formats, ULongToPtr(format->format_id))) { TRACE("for type %s got duplicate synthesized format %p/%s; skipping\n", debugstr_cf(type), format, debugstr_format(format->format_id)); @@ -1531,7 +1531,7 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT else { TRACE("for type %s got synthesized format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - CFSetAddValue(seen_formats, (void*)format->format_id); + CFSetAddValue(seen_formats, ULongToPtr(format->format_id)); formats[pos++] = format; } } @@ -1546,10 +1546,10 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT if (!format->synthesized) continue; /* Don't duplicate a real value with a synthesized value. */ - if (CFSetContainsValue(seen_formats, (void*)format->format_id)) continue; + if (CFSetContainsValue(seen_formats, ULongToPtr(format->format_id))) continue; TRACE("for type %s got synthesized format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - CFSetAddValue(seen_formats, (void*)format->format_id); + CFSetAddValue(seen_formats, ULongToPtr(format->format_id)); formats[pos++] = format; }

1 0

Jinoh Kang : include: Add definition for IShellItemImageFactory.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 97752f35cfc557480dab91c8031e7284f9ecdc7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=97752f35cfc557480dab91c8… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Apr 25 01:44:25 2022 +0900 include: Add definition for IShellItemImageFactory. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shobjidl.idl | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index c1a36ab5e93..a23f3cfdd36 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -471,6 +471,36 @@ interface IShellItem2 : IShellItem [out] BOOL *pf); } +/***************************************************************************** + * IShellItemImageFactory interface + */ +[ + object, + uuid(bcc18b79-ba16-442f-80c4-8a59c30c463b), + pointer_default(unique) +] +interface IShellItemImageFactory : IUnknown +{ + [v1_enum] enum _SIIGBF { + SIIGBF_RESIZETOFIT = 0x00000000, + SIIGBF_BIGGERSIZEOK = 0x00000001, + SIIGBF_MEMORYONLY = 0x00000002, + SIIGBF_ICONONLY = 0x00000004, + SIIGBF_THUMBNAILONLY = 0x00000008, + SIIGBF_INCACHEONLY = 0x00000010, + SIIGBF_CROPTOSQUARE = 0x00000020, + SIIGBF_WIDETHUMBNAILS = 0x00000040, + SIIGBF_ICONBACKGROUND = 0x00000080, + SIIGBF_SCALEUP = 0x00000100, + }; + typedef int SIIGBF; + + HRESULT GetImage( + [in] SIZE size, + [in] SIIGBF flags, + [out] HBITMAP *phbm); +} + typedef [v1_enum] enum tagNWMF { NWMF_UNLOADING = 0x00000001, NWMF_USERINITED = 0x00000002,

1 0

Stefan Dösinger : wined3d: Don't explicitly clear the draw location before starting a renderpass.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 4d4164a80ec83533ee18588c8cf49900c5b3f059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d4164a80ec83533ee18588c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 24 19:24:48 2022 +0300 wined3d: Don't explicitly clear the draw location before starting a renderpass. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 059c44fee9a..b19220c2e34 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3375,7 +3375,12 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if (wined3d_blend_state_get_writemask(state->blend_state, i)) { - wined3d_rendertarget_view_load_location(rtv, &context_vk->c, rtv->resource->draw_binding); + /* We handle clears at the beginning of the render pass, no need for an explicit clear + * first. */ + if (wined3d_rendertarget_view_get_locations(rtv) & WINED3D_LOCATION_CLEARED) + wined3d_rendertarget_view_prepare_location(rtv, &context_vk->c, rtv->resource->draw_binding); + else + wined3d_rendertarget_view_load_location(rtv, &context_vk->c, rtv->resource->draw_binding); invalidate_rt |= (1 << i); } else @@ -3393,9 +3398,17 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if ((dsv = state->fb.depth_stencil)) { if (wined3d_state_uses_depth_buffer(state)) - wined3d_rendertarget_view_load_location(dsv, &context_vk->c, dsv->resource->draw_binding); + { + if (wined3d_rendertarget_view_get_locations(dsv) & WINED3D_LOCATION_CLEARED) + wined3d_rendertarget_view_prepare_location(dsv, &context_vk->c, dsv->resource->draw_binding); + else + wined3d_rendertarget_view_load_location(dsv, &context_vk->c, dsv->resource->draw_binding); + } else + { wined3d_rendertarget_view_prepare_location(dsv, &context_vk->c, dsv->resource->draw_binding); + } + if (!state->depth_stencil_state || state->depth_stencil_state->desc.depth_write) invalidate_ds = true; @@ -3484,11 +3497,15 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c { i = wined3d_bit_scan(&invalidate_rt); rtv = state->fb.render_targets[i]; + wined3d_rendertarget_view_validate_location(rtv, rtv->resource->draw_binding); wined3d_rendertarget_view_invalidate_location(rtv, ~rtv->resource->draw_binding); } if (invalidate_ds) + { + wined3d_rendertarget_view_validate_location(dsv, dsv->resource->draw_binding); wined3d_rendertarget_view_invalidate_location(dsv, ~dsv->resource->draw_binding); + } if (wined3d_context_vk_update_graphics_pipeline_key(context_vk, state, context_vk->graphics.vk_pipeline_layout, &null_buffer_binding) || !context_vk->graphics.vk_pipeline)

1 0

Rémi Bernon : dinput/tests: Remove unreliable IAsyncOperation_boolean checks.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: b01760e734dfb664b656164f450dd6490a541232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b01760e734dfb664b656164f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 15:02:10 2022 +0200 dinput/tests: Remove unreliable IAsyncOperation_boolean checks. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index a4588f7022d..068f5bf1a7e 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5193,7 +5193,6 @@ static void test_windows_gaming_input(void) UINT32 size; HRESULT hr; DWORD ret; - ULONG ref; if (!load_combase_functions()) return; @@ -5395,8 +5394,7 @@ static void test_windows_gaming_input(void) check_bool_async( bool_async, 1, 4, S_OK, FALSE ); IAsyncInfo_Release( async_info ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, &expect_enable_fail, sizeof(expect_enable_fail) ); @@ -5423,8 +5421,7 @@ static void test_windows_gaming_input(void) check_bool_async( bool_async, 1, 4, 0x8685400d, FALSE ); IAsyncInfo_Release( async_info ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); /* canceling the async op is just ignored */ @@ -5468,8 +5465,7 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_Completed returned %#lx\n", hr ); ok( tmp_handler == NULL, "got handler %p\n", tmp_handler ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); /* canceling then closing it calls the handler with closed state */ @@ -5514,8 +5510,7 @@ static void test_windows_gaming_input(void) hr = IAsyncOperation_boolean_get_Completed( bool_async, &tmp_handler ); ok( hr == E_ILLEGAL_METHOD_CALL, "get_Completed returned %#lx\n", hr ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, &expect_enable, sizeof(expect_enable) ); @@ -5523,9 +5518,7 @@ static void test_windows_gaming_input(void) todo_wine ok( hr == S_OK, "TryEnableAsync returned %#lx\n", hr ); wait_hid_expect_( __FILE__, __LINE__, file, 100, TRUE ); - check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, expect_reset, sizeof(expect_reset) ); @@ -5533,9 +5526,7 @@ static void test_windows_gaming_input(void) todo_wine ok( hr == S_OK, "TryResetAsync returned %#lx\n", hr ); wait_hid_expect_( __FILE__, __LINE__, file, 100, TRUE ); - check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); IForceFeedbackMotor_Release( motor );

1 0