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

Henri Verbeet : wined3d: Use wined3d_cs_finish() in wined3d_view_vk_destroy().
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 98137faeb231fbac82910c3779109f0366a82e6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=98137faeb231fbac82910c37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 11 13:54:30 2021 +0100 wined3d: Use wined3d_cs_finish() in wined3d_view_vk_destroy(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8ba912eaee6..de94afe2358 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1394,7 +1394,7 @@ static void wined3d_view_vk_destroy(struct wined3d_device *device, VkBufferView wined3d_cs_destroy_object(device->cs, wined3d_view_vk_destroy_object, ctx); if (ctx == &c) - device->cs->c.ops->finish(&device->cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } static void adapter_vk_destroy_rendertarget_view(struct wined3d_rendertarget_view *view)

1 0

Henri Verbeet : d3d11: Ensure sampler max_lod is >= min_lod.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: cce051b7d6820d8e14109823e3382ed7261d8981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cce051b7d6820d8e14109823… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 11 13:54:31 2021 +0100 d3d11: Ensure sampler max_lod is >= min_lod. A maximum level of detail smaller than the minimum is poorly defined in OpenGL and D3D, and disallowed by Vulkan. Found by the Vulkan validation layers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 737dae93848..6b287176536 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1551,7 +1551,7 @@ static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3 wined3d_desc.mip_filter = wined3d_texture_filter_mip_from_d3d11(desc->Filter); wined3d_desc.lod_bias = desc->MipLODBias; wined3d_desc.min_lod = desc->MinLOD; - wined3d_desc.max_lod = desc->MaxLOD; + wined3d_desc.max_lod = max(desc->MinLOD, desc->MaxLOD); wined3d_desc.mip_base_level = 0; wined3d_desc.max_anisotropy = D3D11_DECODE_IS_ANISOTROPIC_FILTER(desc->Filter) ? desc->MaxAnisotropy : 1; wined3d_desc.compare = wined3d_texture_compare_from_d3d11(desc->Filter);

1 0

Henri Verbeet : wined3d: Set the "compareEnable" field of struct VkSamplerCreateInfo to either 0 or 1.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: f969570c22829351f4afeabb4fee55adce799ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f969570c22829351f4afeabb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 11 13:54:32 2021 +0100 wined3d: Set the "compareEnable" field of struct VkSamplerCreateInfo to either 0 or 1. VkBool32 is (unfortunately) specified as 0/1, instead of zero/non-zero. Found by the validation layers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 38ede905deb..9381c5d3fb9 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -204,7 +204,7 @@ static void wined3d_sampler_vk_cs_init(void *object) sampler_desc.mipLodBias = desc->lod_bias; sampler_desc.anisotropyEnable = desc->max_anisotropy != 1; sampler_desc.maxAnisotropy = desc->max_anisotropy; - sampler_desc.compareEnable = desc->compare; + sampler_desc.compareEnable = !!desc->compare; sampler_desc.compareOp = vk_compare_op_from_wined3d(desc->comparison_func); sampler_desc.minLod = desc->min_lod; sampler_desc.maxLod = desc->max_lod;

1 0

Henri Verbeet : wined3d: Request VK_KHR_external_memory on Vulkan 1.0.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 035dc483881225fb8181f5e4ad85d05ba5c3b989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=035dc483881225fb8181f5e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 11 13:54:33 2021 +0100 wined3d: Request VK_KHR_external_memory on Vulkan 1.0. For VkPhysicalDeviceIDProperties. Found by the validation layers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index de94afe2358..7360ad33e40 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1821,6 +1821,7 @@ static const struct vulkan_instance_extensions[] = { {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, VK_API_VERSION_1_1, FALSE}, + {VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME, VK_API_VERSION_1_1, FALSE}, {VK_KHR_SURFACE_EXTENSION_NAME, ~0u, TRUE}, {VK_KHR_WIN32_SURFACE_EXTENSION_NAME, ~0u, TRUE}, };

1 0

Henri Verbeet : wined3d: End active queries before restarting them in wined3d_query_vk_issue().
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 877cd01bf970e7974ca912ffbf911d3034f5b2df URL: https://source.winehq.org/git/wine.git/?a=commit;h=877cd01bf970e7974ca912ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 11 13:54:34 2021 +0100 wined3d: End active queries before restarting them in wined3d_query_vk_issue(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index b239ee895f6..1ef83891ddf 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1636,6 +1636,11 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) wined3d_context_vk_remove_pending_queries(context_vk, query_vk); memset((void *)query->data, 0, query->data_size); vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk); + if (query_vk->started) + { + wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); + list_remove(&query_vk->entry); + } wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); list_add_head(&context_vk->active_queries, &query_vk->entry); query_vk->started = true;

1 0

Henri Verbeet : wined3d: Pass a resource range to wined3d_context_vk_image_barrier().
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 521cafcfffb156902294ff891d995f51cd41f517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=521cafcfffb156902294ff89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 11 13:54:35 2021 +0100 wined3d: Pass a resource range to wined3d_context_vk_image_barrier(). In particular, this allows different sub-resources of the same texture to have different image layouts, as required when doing blits between them. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 8 +-- dlls/wined3d/device.c | 13 ++--- dlls/wined3d/swapchain.c | 23 +++++--- dlls/wined3d/texture.c | 125 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 102 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=521cafcfffb156902294…

1 0

Georg Lehmann : winevulkan: Fix 64bit enums on old gcc versions.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 5a3b5c96894dd34f26cfda6d64d3e333b3c8efa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a3b5c96894dd34f26cfda6d… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Mar 11 15:05:22 2021 +0100 winevulkan: Fix 64bit enums on old gcc versions. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 12 ++- include/wine/vulkan.h | 179 +++++++++++++++++++++----------------------- 2 files changed, 96 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a3b5c96894dd34f26cf…

1 0

Zebediah Figura : configure: Use -Winit-self if possible.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 131d2d2ef3ab180eeb9d6c7e7b9c8bd8697b62d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=131d2d2ef3ab180eeb9d6c7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 11 10:08:06 2021 -0600 configure: Use -Winit-self if possible. This protects against variable initialization like "int x = x". gcc apparently treats this as an intentional way to suppress uninitialized or unused variable warnings, but in my case it has caused at least one confusing bug. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ 2 files changed, 58 insertions(+) diff --git a/configure b/configure index 475fcfdf749..9026b1f53ad 100755 --- a/configure +++ b/configure @@ -9981,6 +9981,37 @@ fi $as_echo "$ac_cv_crosscflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_crosscflags__Wignored_qualifiers" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wignored-qualifiers" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Winit-self" >&5 +$as_echo_n "checking whether the cross-compiler supports -Winit-self... " >&6; } +if ${ac_cv_crosscflags__Winit_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -Winit-self" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_crosscflags__Winit_self=yes +else + ac_cv_crosscflags__Winit_self=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Winit_self" >&5 +$as_echo "$ac_cv_crosscflags__Winit_self" >&6; } +if test "x$ac_cv_crosscflags__Winit_self" = xyes; then : + EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Winit-self" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wpacked-not-aligned" >&5 $as_echo_n "checking whether the cross-compiler supports -Wpacked-not-aligned... " >&6; } @@ -17193,6 +17224,31 @@ fi $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Winit-self" >&5 +$as_echo_n "checking whether the compiler supports -Winit-self... " >&6; } +if ${ac_cv_cflags__Winit_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Winit-self" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Winit_self=yes +else + ac_cv_cflags__Winit_self=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Winit_self" >&5 +$as_echo "$ac_cv_cflags__Winit_self" >&6; } +if test "x$ac_cv_cflags__Winit_self" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -Winit-self" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpacked-not-aligned" >&5 $as_echo_n "checking whether the compiler supports -Wpacked-not-aligned... " >&6; } diff --git a/configure.ac b/configure.ac index 5b7f09de924..1ca832102d8 100644 --- a/configure.ac +++ b/configure.ac @@ -1044,6 +1044,7 @@ then WINE_TRY_CROSSCFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CROSSCFLAGS([-Wempty-body]) WINE_TRY_CROSSCFLAGS([-Wignored-qualifiers]) + WINE_TRY_CROSSCFLAGS([-Winit-self]) WINE_TRY_CROSSCFLAGS([-Wpacked-not-aligned],[EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-packed-not-aligned"]) WINE_TRY_CROSSCFLAGS([-Wpragma-pack],[EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-pragma-pack"]) WINE_TRY_CROSSCFLAGS([-Wshift-overflow=2]) @@ -2024,6 +2025,7 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) + WINE_TRY_CFLAGS([-Winit-self]) WINE_TRY_CFLAGS([-Wpacked-not-aligned],[EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned"]) WINE_TRY_CFLAGS([-Wpragma-pack],[EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack"]) WINE_TRY_CFLAGS([-Wshift-overflow=2])

1 0

Jacek Caban : mshtml: Initialize attribute object with compatibility mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 5a813f6f6e15bb00dcb64dde7907b08098d52d60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a813f6f6e15bb00dcb64dde… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:39:54 2021 +0100 mshtml: Initialize attribute object with compatibility mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 61c6455027a..8e72c9a8045 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -497,6 +497,7 @@ HTMLDOMAttribute *unsafe_impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *iface) HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) { + compat_mode_t compat_mode = elem ? dispex_compat_mode(&elem->node.event_target.dispex) : COMPAT_MODE_QUIRKS; HTMLAttributeCollection *col; HTMLDOMAttribute *ret; HRESULT hres; @@ -511,8 +512,8 @@ HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dis ret->dispid = dispid; ret->elem = elem; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMAttribute_iface, - &HTMLDOMAttribute_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLDOMAttribute_iface, + &HTMLDOMAttribute_dispex, compat_mode); /* For attributes attached to an element, (elem,dispid) pair should be valid used for its operation. */ if(elem) {

1 0

Jacek Caban : mshtml: Initialize HTMLRect object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: d6fcfe241c43ac19504b667dd565445d82997966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6fcfe241c43ac19504b667d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:01 2021 +0100 mshtml: Initialize HTMLRect object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f93e015f559..514212217e1 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -501,7 +501,7 @@ static dispex_static_data_t HTMLRect_dispex = { HTMLRect_iface_tids }; -static HRESULT create_html_rect(nsIDOMClientRect *nsrect, IHTMLRect **ret) +static HRESULT create_html_rect(nsIDOMClientRect *nsrect, compat_mode_t compat_mode, IHTMLRect **ret) { HTMLRect *rect; @@ -512,7 +512,7 @@ static HRESULT create_html_rect(nsIDOMClientRect *nsrect, IHTMLRect **ret) rect->IHTMLRect_iface.lpVtbl = &HTMLRectVtbl; rect->ref = 1; - init_dispex(&rect->dispex, (IUnknown*)&rect->IHTMLRect_iface, &HTMLRect_dispex); + init_dispex_with_compat_mode(&rect->dispex, (IUnknown*)&rect->IHTMLRect_iface, &HTMLRect_dispex, compat_mode); nsIDOMClientRect_AddRef(nsrect); rect->nsrect = nsrect; @@ -659,7 +659,7 @@ static HRESULT WINAPI HTMLRectCollection_item(IHTMLRectCollection *iface, VARIAN return S_OK; } - hres = create_html_rect(nsrect, &rect); + hres = create_html_rect(nsrect, dispex_compat_mode(&This->dispex), &rect); nsIDOMClientRect_Release(nsrect); if(FAILED(hres)) return hres; @@ -728,7 +728,7 @@ static HRESULT HTMLRectCollection_invoke(DispatchEx *dispex, DISPID id, LCID lci return DISP_E_UNKNOWNNAME; } - hres = create_html_rect(rect, &html_rect); + hres = create_html_rect(rect, dispex_compat_mode(&This->dispex), &html_rect); nsIDOMClientRect_Release(rect); if(FAILED(hres)) return hres; @@ -2696,7 +2696,7 @@ static HRESULT WINAPI HTMLElement2_getBoundingClientRect(IHTMLElement2 *iface, I return E_FAIL; } - hres = create_html_rect(nsrect, pRect); + hres = create_html_rect(nsrect, dispex_compat_mode(&This->node.event_target.dispex), pRect); nsIDOMClientRect_Release(nsrect); return hres;

1 0