February 2023 - Wine-commits

Connor McAdams : uiautomationcore: Add UiaRaiseNotificationEvent stub.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: e84b95ef6f64a2a267f54e337ed2c5ca37bd3485 URL: https://gitlab.winehq.org/wine/wine/-/commit/e84b95ef6f64a2a267f54e337ed2c5… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 2 12:57:48 2023 -0500 uiautomationcore: Add UiaRaiseNotificationEvent stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_main.c | 11 +++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 7d8dca82b83..ca27ae927d4 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -347,6 +347,17 @@ HRESULT WINAPI UiaRaiseTextEditTextChangedEvent(IRawElementProviderSimple *provi return S_OK; } +/*********************************************************************** + * UiaRaiseNotificationEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseNotificationEvent(IRawElementProviderSimple *provider, enum NotificationKind notification_kind, + enum NotificationProcessing notification_processing, BSTR display_str, BSTR activity_id) +{ + FIXME("(%p, %d, %d, %s, %s): stub\n", provider, notification_kind, notification_processing, + debugstr_w(display_str), debugstr_w(activity_id)); + return S_OK; +} + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { struct hwnd_host_provider *host_prov; diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 9469d39c8bc..7ae363bb93b 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -88,7 +88,7 @@ @ stdcall UiaRaiseAutomationEvent(ptr long) @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) #@ stub UiaRaiseChangesEvent -#@ stub UiaRaiseNotificationEvent +@ stdcall UiaRaiseNotificationEvent(ptr long long wstr wstr) @ stdcall UiaRaiseStructureChangedEvent(ptr long ptr long) @ stdcall UiaRaiseTextEditTextChangedEvent(ptr long ptr) @ stdcall UiaRegisterProviderCallback(ptr) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 0c06f374ed5..5ee79bcd1e9 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -480,6 +480,8 @@ HRESULT WINAPI UiaRaiseAsyncContentLoadedEvent(IRawElementProviderSimple *provid enum AsyncContentLoadedState async_content_loaded_state, double percent_complete); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *, PROPERTYID, VARIANT, VARIANT); +HRESULT WINAPI UiaRaiseNotificationEvent(IRawElementProviderSimple *provider, enum NotificationKind notification_kind, + enum NotificationProcessing notification_processing, BSTR display_str, BSTR activity_id); HRESULT WINAPI UiaRaiseStructureChangedEvent(IRawElementProviderSimple *provider, enum StructureChangeType struct_change_type, int *runtime_id, int runtime_id_len); HRESULT WINAPI UiaRaiseTextEditTextChangedEvent(IRawElementProviderSimple *provider, enum TextEditChangeType text_edit_change_type,

1 0

Connor McAdams : uiautomationcore: Add UiaRaiseChangesEvent stub.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 23c10c928b68918515b6ec195d90b09ef5936451 URL: https://gitlab.winehq.org/wine/wine/-/commit/23c10c928b68918515b6ec195d90b0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 2 12:59:41 2023 -0500 uiautomationcore: Add UiaRaiseChangesEvent stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_main.c | 10 ++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index ca27ae927d4..00798bd9985 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -358,6 +358,16 @@ HRESULT WINAPI UiaRaiseNotificationEvent(IRawElementProviderSimple *provider, en return S_OK; } +/*********************************************************************** + * UiaRaiseChangesEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseChangesEvent(IRawElementProviderSimple *provider, int event_id_count, + struct UiaChangeInfo *uia_changes) +{ + FIXME("(%p, %d, %p): stub\n", provider, event_id_count, uia_changes); + return S_OK; +} + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { struct hwnd_host_provider *host_prov; diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 7ae363bb93b..4b7a69ca25c 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -87,7 +87,7 @@ @ stdcall UiaRaiseAsyncContentLoadedEvent(ptr long double) @ stdcall UiaRaiseAutomationEvent(ptr long) @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) -#@ stub UiaRaiseChangesEvent +@ stdcall UiaRaiseChangesEvent(ptr long ptr) @ stdcall UiaRaiseNotificationEvent(ptr long long wstr wstr) @ stdcall UiaRaiseStructureChangedEvent(ptr long ptr long) @ stdcall UiaRaiseTextEditTextChangedEvent(ptr long ptr) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 5ee79bcd1e9..6f0bfaf4ecd 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -480,6 +480,8 @@ HRESULT WINAPI UiaRaiseAsyncContentLoadedEvent(IRawElementProviderSimple *provid enum AsyncContentLoadedState async_content_loaded_state, double percent_complete); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *, PROPERTYID, VARIANT, VARIANT); +HRESULT WINAPI UiaRaiseChangesEvent(IRawElementProviderSimple *provider, int event_id_count, + struct UiaChangeInfo *uia_changes); HRESULT WINAPI UiaRaiseNotificationEvent(IRawElementProviderSimple *provider, enum NotificationKind notification_kind, enum NotificationProcessing notification_processing, BSTR display_str, BSTR activity_id); HRESULT WINAPI UiaRaiseStructureChangedEvent(IRawElementProviderSimple *provider, enum StructureChangeType struct_change_type,

1 0

Max Figura : wined3d: Move the WINED3D_RS_ANTIALIAS stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 8bb11da52861044fe8fc8fdf658ca74ce58ff8fd URL: https://gitlab.winehq.org/wine/wine/-/commit/8bb11da52861044fe8fc8fdf658ca7… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 11:17:01 2022 -0600 wined3d: Move the WINED3D_RS_ANTIALIAS stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 10 +--------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 13f4f8c024c..5d21c96c094 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -96,7 +96,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, - {STATE_RENDER(WINED3D_RS_ANTIALIAS), {STATE_RENDER(WINED3D_RS_ANTIALIAS), state_nop}}, {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_RENDER(WINED3D_RS_WRAPU), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_RENDER(WINED3D_RS_WRAPV), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 133ddd1f96e..df2ac1c57df 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4039,6 +4039,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, wined3d_device_set_render_state(device, idx, state->rs[idx]); break; + case WINED3D_RS_ANTIALIAS: + if (state->rs[WINED3D_RS_ANTIALIAS]) + FIXME("Antialias not supported yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index abfd86a6f72..6a15ab937b8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2808,7 +2808,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_ANTIALIAS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9603a750028..e1d4cf946b0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1999,12 +1999,6 @@ static void state_stippledalpha(struct wined3d_context *context, const struct wi FIXME("Stippled Alpha not supported yet.\n"); } -static void state_antialias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_ANTIALIAS]) - FIXME("Antialias not supported yet.\n"); -} - static void state_sample_mask(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; @@ -4786,7 +4780,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_ANTIALIAS), { STATE_RENDER(WINED3D_RS_ANTIALIAS), state_antialias }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPU), { STATE_RENDER(WINED3D_RS_WRAPU), state_wrapu }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE }, @@ -5593,8 +5586,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) } rs_holes[] = { - { 1, 1}, - { 3, 3}, + { 1, 3}, { 7, 8}, { 14, 14}, { 17, 23},

1 0

Max Figura : wined3d: Move the WINED3D_RS_TEXTUREPERSPECTIVE stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: c126a7eacd077fc9fa4ab040c51b688a7d7ba9fa URL: https://gitlab.winehq.org/wine/wine/-/commit/c126a7eacd077fc9fa4ab040c51b68… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 12:01:56 2022 -0600 wined3d: Move the WINED3D_RS_TEXTUREPERSPECTIVE stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 3 +++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5d21c96c094..57f7996bbf9 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -96,7 +96,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, - {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_RENDER(WINED3D_RS_WRAPU), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_RENDER(WINED3D_RS_WRAPV), state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index df2ac1c57df..d8ad324471b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4044,6 +4044,9 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Antialias not supported yet.\n"); break; + case WINED3D_RS_TEXTUREPERSPECTIVE: + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6a15ab937b8..e571a11b917 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2808,7 +2808,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e1d4cf946b0..46880235f64 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4780,7 +4780,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPU), { STATE_RENDER(WINED3D_RS_WRAPU), state_wrapu }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, @@ -5586,7 +5585,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) } rs_holes[] = { - { 1, 3}, + { 1, 4}, { 7, 8}, { 14, 14}, { 17, 23},

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAPU stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: ef4a893e2e1f6c70da831482c386999db77b5590 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef4a893e2e1f6c70da831482c38699… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 12:06:38 2022 -0600 wined3d: Move the WINED3D_RS_WRAPU stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 9 +-------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 57f7996bbf9..870fefcd0ec 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -96,7 +96,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, - {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_RENDER(WINED3D_RS_WRAPU), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_RENDER(WINED3D_RS_WRAPV), state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_MONOENABLE), {STATE_RENDER(WINED3D_RS_MONOENABLE), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d8ad324471b..6099e6fffd7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4047,6 +4047,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_TEXTUREPERSPECTIVE: break; + case WINED3D_RS_WRAPU: + if (state->rs[WINED3D_RS_WRAPU]) + FIXME("Render state WINED3D_RS_WRAPU not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e571a11b917..c314baa6696 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2808,7 +2808,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAPU), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_MONOENABLE), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 46880235f64..52b408a4d84 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2072,12 +2072,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_wrapu(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_WRAPU]) - FIXME("Render state WINED3D_RS_WRAPU not implemented yet.\n"); -} - static void state_wrapv(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_WRAPV]) @@ -4780,7 +4774,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAPU), { STATE_RENDER(WINED3D_RS_WRAPU), state_wrapu }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, @@ -5585,7 +5578,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) } rs_holes[] = { - { 1, 4}, + { 1, 5}, { 7, 8}, { 14, 14}, { 17, 23},

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAPV stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 089ef6f38b574676f080fcc10b097007e51bddc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/089ef6f38b574676f080fcc10b0970… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 12:10:03 2022 -0600 wined3d: Move the WINED3D_RS_WRAPV stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 10 +--------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 870fefcd0ec..6cf8f50f2c2 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -96,7 +96,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_VIEWPORT, {STATE_VIEWPORT, state_nop}}, {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, - {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_RENDER(WINED3D_RS_WRAPV), state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_MONOENABLE), {STATE_RENDER(WINED3D_RS_MONOENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_ROP2), {STATE_RENDER(WINED3D_RS_ROP2), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6099e6fffd7..b7d312aac65 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4052,6 +4052,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_WRAPU not implemented yet.\n"); break; + case WINED3D_RS_WRAPV: + if (state->rs[WINED3D_RS_WRAPV]) + FIXME("Render state WINED3D_RS_WRAPV not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c314baa6696..3f8aeef017a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2808,7 +2808,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VIEWPORT, {STATE_VDECL}}, {STATE_INDEXBUFFER, {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAPV), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_MONOENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ROP2), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 52b408a4d84..288cd40f3fc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2072,12 +2072,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_wrapv(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_WRAPV]) - FIXME("Render state WINED3D_RS_WRAPV not implemented yet.\n"); -} - static void state_monoenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_MONOENABLE]) @@ -4774,7 +4768,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_MONOENABLE), { STATE_RENDER(WINED3D_RS_MONOENABLE), state_monoenable }, WINED3D_GL_EXT_NONE }, @@ -5578,8 +5571,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) } rs_holes[] = { - { 1, 5}, - { 7, 8}, + { 1, 8}, { 14, 14}, { 17, 23}, { 27, 27},

1 0

Zebediah Figura : wined3d: Introduce wined3d_texture_get_swapchain().
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 302996efaebe7e1b03675bf208f0e274980b5b51 URL: https://gitlab.winehq.org/wine/wine/-/commit/302996efaebe7e1b03675bf208f0e2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 2 19:36:09 2023 -0600 wined3d: Introduce wined3d_texture_get_swapchain(). --- dlls/wined3d/texture.c | 5 +++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8d416494eb8..33b938ad460 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4313,6 +4313,11 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un return WINED3D_OK; } +struct wined3d_swapchain * CDECL wined3d_texture_get_swapchain(struct wined3d_texture *texture) +{ + return texture->swapchain; +} + void * CDECL wined3d_texture_get_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx) { TRACE("texture %p, sub_resource_idx %u.\n", texture, sub_resource_idx); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 827ac295ddc..b22adf07c9c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -301,6 +301,7 @@ @ cdecl wined3d_texture_get_resource(ptr) @ cdecl wined3d_texture_get_sub_resource_desc(ptr long ptr) @ cdecl wined3d_texture_get_sub_resource_parent(ptr long) +@ cdecl wined3d_texture_get_swapchain(ptr) @ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_release_dc(ptr long ptr) @ cdecl wined3d_texture_set_color_key(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f4ec2470bba..5d8a1156b21 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2857,6 +2857,7 @@ struct wined3d_resource * __cdecl wined3d_texture_get_resource(struct wined3d_te HRESULT __cdecl wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc); void * __cdecl wined3d_texture_get_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx); +struct wined3d_swapchain * __cdecl wined3d_texture_get_swapchain(struct wined3d_texture *texture); ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc); HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture,

1 0

Zebediah Figura : dxgi: Implement IDXGIResource::GetUsage().
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 555cee64498952e3981fed2d2be6525d91b4f99d URL: https://gitlab.winehq.org/wine/wine/-/commit/555cee64498952e3981fed2d2be652… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 2 20:32:34 2023 -0600 dxgi: Implement IDXGIResource::GetUsage(). --- dlls/dxgi/resource.c | 30 ++++++++++++++++++++++++++++-- dlls/dxgi/tests/dxgi.c | 25 +++++++++++++++++-------- dlls/dxgi/utils.c | 3 --- 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/resource.c b/dlls/dxgi/resource.c index 86ad4ec3f09..9699b7672f9 100644 --- a/dlls/dxgi/resource.c +++ b/dlls/dxgi/resource.c @@ -350,9 +350,35 @@ static HRESULT STDMETHODCALLTYPE dxgi_resource_GetSharedHandle(IDXGIResource *if static HRESULT STDMETHODCALLTYPE dxgi_resource_GetUsage(IDXGIResource *iface, DXGI_USAGE *usage) { - FIXME("iface %p, usage %p stub!\n", iface, usage); + struct dxgi_resource *resource = impl_from_IDXGIResource(iface); + struct wined3d_resource_desc resource_desc; - return E_NOTIMPL; + TRACE("iface %p, usage %p.\n", iface, usage); + + wined3d_resource_get_desc(resource->wined3d_resource, &resource_desc); + + *usage = dxgi_usage_from_wined3d_bind_flags(resource_desc.bind_flags); + + if (resource_desc.resource_type != WINED3D_RTYPE_BUFFER) + { + struct wined3d_texture *texture = wined3d_texture_from_resource(resource->wined3d_resource); + struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_swapchain *swapchain; + + if ((swapchain = wined3d_texture_get_swapchain(texture))) + { + *usage |= DXGI_USAGE_BACK_BUFFER; + + wined3d_swapchain_get_desc(swapchain, &swapchain_desc); + if (swapchain_desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD) + *usage |= DXGI_USAGE_DISCARD_ON_PRESENT; + + if (wined3d_swapchain_get_back_buffer(swapchain, 0) != texture) + *usage |= DXGI_USAGE_READ_ONLY; + } + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_resource_SetEvictionPriority(IDXGIResource *iface, UINT eviction_priority) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 73ea891119f..e0465b90ed0 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4016,6 +4016,7 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) { DXGI_SWAP_CHAIN_DESC swapchain_desc; DXGI_SWAP_EFFECT swap_effect; + IDXGIResource *dxgi_resource; IDXGISwapChain3 *swapchain3; IUnknown *present_queue[2]; IDXGISwapChain *swapchain; @@ -4056,13 +4057,18 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + expected_hr = is_d3d12 ? E_NOINTERFACE : S_OK; + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGIResource, (void **)&dxgi_resource); + ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); + ok(!dxgi_resource || hr == S_OK, "Got unexpected pointer %p.\n", dxgi_resource); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); ok(!surface || hr == S_OK, "Got unexpected pointer %p.\n", surface); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&texture); ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); ok(!texture || hr == S_OK, "Got unexpected pointer %p.\n", texture); + expected_hr = is_d3d12 ? S_OK : E_NOINTERFACE; hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D12Resource, (void **)&resource); ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); @@ -4175,16 +4181,23 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) check_resource_desc(resource, &swapchain_desc); ID3D12Resource_Release(resource); } + if (dxgi_resource) + IDXGIResource_Release(dxgi_resource); hr = IDXGISwapChain_ResizeBuffers(swapchain, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + expected_hr = is_d3d12 ? E_NOINTERFACE : S_OK; + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGIResource, (void **)&dxgi_resource); + ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); + ok(!surface || hr == S_OK, "Got unexpected pointer %p.\n", surface); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); ok(!surface || hr == S_OK, "Got unexpected pointer %p.\n", surface); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&texture); ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); ok(!texture || hr == S_OK, "Got unexpected pointer %p.\n", texture); + expected_hr = is_d3d12 ? S_OK : E_NOINTERFACE; hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D12Resource, (void **)&resource); ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); @@ -4246,6 +4259,8 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) check_resource_desc(resource, &swapchain_desc); ID3D12Resource_Release(resource); } + if (dxgi_resource) + IDXGIResource_Release(dxgi_resource); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -4495,9 +4510,7 @@ static void test_swapchain_parameters(void) expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER; hr = IDXGIResource_GetUsage(resource, &usage); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx, test %u.\n", hr, i); - todo_wine ok((usage & expected_usage) == expected_usage, "Got usage %x, expected %x, test %u.\n", usage, expected_usage, i); @@ -4534,9 +4547,7 @@ static void test_swapchain_parameters(void) broken_usage |= DXGI_USAGE_READ_ONLY; hr = IDXGIResource_GetUsage(resource, &usage); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx, test %u, buffer %u.\n", hr, i, j); - todo_wine ok(usage == expected_usage || broken(usage == broken_usage), "Got usage %x, expected %x, test %u, buffer %u.\n", usage, expected_usage, i, j); @@ -4607,9 +4618,7 @@ static void test_swapchain_parameters(void) ok(hr == S_OK, "Got unexpected hr %#lx, test %u.\n", hr, i); expected_usage = usage | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_DISCARD_ON_PRESENT; hr = IDXGIResource_GetUsage(resource, &usage); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx, test %u.\n", hr, i); - todo_wine_if(i != 7) ok(usage == expected_usage, "Got usage %x, expected %x, test %u.\n", usage, expected_usage, i); IDXGIResource_Release(resource); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index d701725afa9..e99951e0a04 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -494,9 +494,6 @@ DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) if (wined3d_bind_flags & WINED3D_BIND_UNORDERED_ACCESS) dxgi_usage |= DXGI_USAGE_UNORDERED_ACCESS; - wined3d_bind_flags &= ~(WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_UNORDERED_ACCESS); - if (wined3d_bind_flags) - FIXME("Unhandled wined3d bind flags %#x.\n", wined3d_bind_flags); return dxgi_usage; }

1 0

Zebediah Figura : d3d11: Expand tests for IDXGIResource.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 80bb094e4a272a996fa63edb85cce2e11e4e2e3a URL: https://gitlab.winehq.org/wine/wine/-/commit/80bb094e4a272a996fa63edb85cce2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 2 20:33:08 2023 -0600 d3d11: Expand tests for IDXGIResource. --- dlls/d3d11/tests/d3d11.c | 146 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 120 insertions(+), 26 deletions(-)

1 0

Zebediah Figura : wined3d: Destroy objects belonging to wined3d_context_vk.completed_command_buffer_id.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: a1b3a798952fcaa91a5481b07f87f9c5d5333fc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1b3a798952fcaa91a5481b07f87f9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 2 16:46:09 2023 -0600 wined3d: Destroy objects belonging to wined3d_context_vk.completed_command_buffer_id. Not just those belonging to earlier completed command buffers. completed_command_buffer_id names the most recent command buffer to be completed. In essence, this fixes an off-by-one error. --- dlls/wined3d/context_vk.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 769e5347cc5..1acb8a8d201 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -667,7 +667,7 @@ void wined3d_context_vk_destroy_vk_framebuffer(struct wined3d_context_vk *contex const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_retired_object_vk *o; - if (context_vk->completed_command_buffer_id > command_buffer_id) + if (context_vk->completed_command_buffer_id >= command_buffer_id) { VK_CALL(vkDestroyFramebuffer(device_vk->vk_device, vk_framebuffer, NULL)); TRACE("Destroyed framebuffer 0x%s.\n", wine_dbgstr_longlong(vk_framebuffer)); @@ -708,7 +708,7 @@ static void wined3d_context_vk_reset_vk_descriptor_pool(struct wined3d_context_v { struct wined3d_retired_object_vk *o; - if (context_vk->completed_command_buffer_id > command_buffer_id) + if (context_vk->completed_command_buffer_id >= command_buffer_id) { wined3d_context_vk_return_vk_descriptor_pool(context_vk, vk_descriptor_pool); TRACE("Reset descriptor pool 0x%s.\n", wine_dbgstr_longlong(vk_descriptor_pool)); @@ -733,7 +733,7 @@ void wined3d_context_vk_destroy_vk_memory(struct wined3d_context_vk *context_vk, const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_retired_object_vk *o; - if (context_vk->completed_command_buffer_id > command_buffer_id) + if (context_vk->completed_command_buffer_id >= command_buffer_id) { VK_CALL(vkFreeMemory(device_vk->vk_device, vk_memory, NULL)); TRACE("Freed memory 0x%s.\n", wine_dbgstr_longlong(vk_memory)); @@ -756,7 +756,7 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte { struct wined3d_retired_object_vk *o; - if (context_vk->completed_command_buffer_id > command_buffer_id) + if (context_vk->completed_command_buffer_id >= command_buffer_id) { wined3d_context_vk_free_memory(context_vk, block); TRACE("Freed block %p.\n", block); @@ -811,7 +811,7 @@ static void wined3d_context_vk_destroy_bo_slab_slice(struct wined3d_context_vk * { struct wined3d_retired_object_vk *o; - if (context_vk->completed_command_buffer_id > command_buffer_id) + if (context_vk->completed_command_buffer_id >= command_buffer_id) { wined3d_bo_slab_vk_free_slice(slab, idx, context_vk); return; @@ -836,7 +836,7 @@ static void wined3d_context_vk_destroy_vk_buffer(struct wined3d_context_vk *cont const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_retired_object_vk *o; - if (context_vk->completed_command_buffer_id > command_buffer_id) + if (context_vk->completed_command_buffer_id >= command_buffer_id) { VK_CALL(vkDestroyBuffer(device_vk->vk_device, vk_buffer, NULL)); TRACE("Destroyed buffer 0x%s.\n", wine_dbgstr_longlong(vk_buffer)); @@ -861,7 +861,7 @@ void wined3d_context_vk_destroy_vk_image(struct wined3d_context_vk *context_vk, const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_retired_object_vk *o; - if (context_vk->completed_command_buffer_id > command_buffer_id) + if (context_vk->completed_command_buffer_id >= command_buffer_id) { VK_CALL(vkDestroyImage(device_vk->vk_device, vk_image, NULL)); TRACE("Destroyed image 0x%s.\n", wine_dbgstr_longlong(vk_image)); @@ -886,7 +886,7 @@ void wined3d_context_vk_destroy_vk_buffer_view(struct wined3d_context_vk *contex const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_retired_object_vk *o; - if (context_vk->completed_command_buffer_id > command_buffer_id) + if (context_vk->completed_command_buffer_id >= command_buffer_id) { VK_CALL(vkDestroyBufferView(device_vk->vk_device, vk_view, NULL)); TRACE("Destroyed buffer view 0x%s.\n", wine_dbgstr_longlong(vk_view)); @@ -911,7 +911,7 @@ void wined3d_context_vk_destroy_vk_image_view(struct wined3d_context_vk *context const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_retired_object_vk *o; - if (context_vk->completed_command_buffer_id > command_buffer_id) + if (context_vk->completed_command_buffer_id >= command_buffer_id) { VK_CALL(vkDestroyImageView(device_vk->vk_device, vk_view, NULL)); TRACE("Destroyed image view 0x%s.\n", wine_dbgstr_longlong(vk_view)); @@ -971,7 +971,7 @@ void wined3d_context_vk_destroy_vk_pipeline(struct wined3d_context_vk *context_v const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_retired_object_vk *o; - if (context_vk->completed_command_buffer_id > command_buffer_id) + if (context_vk->completed_command_buffer_id >= command_buffer_id) { VK_CALL(vkDestroyPipeline(device_vk->vk_device, vk_pipeline, NULL)); TRACE("Destroyed pipeline 0x%s.\n", wine_dbgstr_longlong(vk_pipeline)); @@ -997,7 +997,7 @@ void wined3d_context_vk_destroy_vk_sampler(struct wined3d_context_vk *context_vk const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_retired_object_vk *o; - if (context_vk->completed_command_buffer_id > command_buffer_id) + if (context_vk->completed_command_buffer_id >= command_buffer_id) { VK_CALL(vkDestroySampler(device_vk->vk_device, vk_sampler, NULL)); TRACE("Destroyed sampler 0x%s.\n", wine_dbgstr_longlong(vk_sampler)); @@ -1022,7 +1022,7 @@ void wined3d_context_vk_destroy_vk_event(struct wined3d_context_vk *context_vk, const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_retired_object_vk *o; - if (context_vk->completed_command_buffer_id > command_buffer_id) + if (context_vk->completed_command_buffer_id >= command_buffer_id) { VK_CALL(vkDestroyEvent(device_vk->vk_device, vk_event, NULL)); TRACE("Destroyed event 0x%s.\n", wine_dbgstr_longlong(vk_event));

1 0