May 2020 - Wine-Commits - list.winehq.org

Alex Henrie : ws2_32/tests: Fix typos in test_WSAStringToAddress.
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: 205e09bc308e8344cfd1330871866ced37f606a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=205e09bc308e8344cfd13308… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 20 08:11:16 2020 -0600 ws2_32/tests: Fix typos in test_WSAStringToAddress. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 134c4d383f..a89a964129 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3546,13 +3546,13 @@ static void test_WSAStringToAddress(void) ipv6_tests[j].address[6], ipv6_tests[j].address[7] ); ok( sockaddr6.sin6_scope_id == 0, "WSAStringToAddress(%s) gave scope %d, expected 0\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr6.sin6_scope_id ); + wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_scope_id ); ok( sockaddr6.sin6_port == ipv6_tests[j].port, "WSAStringToAddress(%s) gave port %04x, expected %04x\n", wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_port, ipv6_tests[j].port ); ok( sockaddr6.sin6_flowinfo == 0, "WSAStringToAddress(%s) gave flowinfo %d, expected 0\n", - wine_dbgstr_a( ipv4_tests[j].input ), sockaddr6.sin6_flowinfo ); + wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_flowinfo ); } } }

1 0

Jacek Caban : include: Add winapifamily.h file.
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: 5ab64243dafa23cd36ad02ec737fcad9a58a78e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ab64243dafa23cd36ad02ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 20 17:54:21 2020 +0200 include: Add winapifamily.h file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/winapifamily.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 1 + 3 files changed, 64 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 6aff236a7c..2f2d94d574 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -715,6 +715,7 @@ SOURCES = \ wia_xp.idl \ wiadef.h \ wimgapi.h \ + winapifamily.h \ winbase.h \ wincodec.idl \ wincodecsdk.idl \ diff --git a/include/winapifamily.h b/include/winapifamily.h new file mode 100644 index 0000000000..c1df2e1627 --- /dev/null +++ b/include/winapifamily.h @@ -0,0 +1,62 @@ +/* + * Copyright 2020 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _INC_WINAPIFAMILY +#define _INC_WINAPIFAMILY + +#define WINAPI_FAMILY_PC_APP 2 +#define WINAPI_FAMILY_PHONE_APP 3 +#define WINAPI_FAMILY_SYSTEM 4 +#define WINAPI_FAMILY_SERVER 5 +#define WINAPI_FAMILY_DESKTOP_APP 100 + +#define WINAPI_FAMILY_APP WINAPI_FAMILY_PC_APP + +#ifndef WINAPI_FAMILY +#define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP +#endif + +#ifndef WINAPI_PARTITION_DESKTOP +#define WINAPI_PARTITION_DESKTOP (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) +#endif + +#ifndef WINAPI_PARTITION_APP +#define WINAPI_PARTITION_APP (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP || \ + WINAPI_FAMILY == WINAPI_FAMILY_PC_APP || \ + WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +#endif + +#ifndef WINAPI_PARTITION_PC_APP +#define WINAPI_PARTITION_PC_APP (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP || \ + WINAPI_FAMILY == WINAPI_FAMILY_PC_APP) +#endif + +#ifndef WINAPI_PARTITION_PHONE_APP +#define WINAPI_PARTITION_PHONE_APP (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +#endif + +#ifndef WINAPI_PARTITION_SYSTEM +#define WINAPI_PARTITION_SYSTEM (WINAPI_FAMILY == WINAPI_FAMILY_SYSTEM || \ + WINAPI_FAMILY == WINAPI_FAMILY_SERVER) +#endif + +#define WINAPI_PARTITION_PHONE WINAPI_PARTITION_PHONE_APP + +#define WINAPI_FAMILY_PARTITION(x) x + +#endif /* _INC_WINAPIFAMILY */ diff --git a/include/winnt.h b/include/winnt.h index 46e17c546a..99c3793346 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -23,6 +23,7 @@ #include <basetsd.h> #include <guiddef.h> +#include <winapifamily.h> #ifndef RC_INVOKED #include <ctype.h>

1 0

Akihiro Sagawa : strmbase: Allow NULL pin_get_media_type() callback in source_Connect().
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: b9dc3324d7aa3397aa71e108e3e1fb5491eee525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9dc3324d7aa3397aa71e108… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 20 23:36:01 2020 +0900 strmbase: Allow NULL pin_get_media_type() callback in source_Connect(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index b5f8092e9e..eab7c0cb2e 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -516,17 +516,20 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP return hr; } - for (i = 0; pin->pFuncsTable->base.pin_get_media_type(&pin->pin, i, &candidate) == S_OK; ++i) + if (pin->pFuncsTable->base.pin_get_media_type) { - strmbase_dump_media_type(&candidate); - if (compare_media_types(mt, &candidate) - && pin->pFuncsTable->pfnAttemptConnection(pin, peer, &candidate) == S_OK) + for (i = 0; pin->pFuncsTable->base.pin_get_media_type(&pin->pin, i, &candidate) == S_OK; ++i) { - LeaveCriticalSection(&pin->pin.filter->csFilter); + strmbase_dump_media_type(&candidate); + if (compare_media_types(mt, &candidate) + && pin->pFuncsTable->pfnAttemptConnection(pin, peer, &candidate) == S_OK) + { + LeaveCriticalSection(&pin->pin.filter->csFilter); + FreeMediaType(&candidate); + return S_OK; + } FreeMediaType(&candidate); - return S_OK; } - FreeMediaType(&candidate); } if (SUCCEEDED(IPin_EnumMediaTypes(peer, &enummt)))

1 0

Alex Henrie : ws2_32: Don't set output length in WSAStringToAddress on error.
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: c84e416d2308c6aa8266d78457f16a11f9324e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c84e416d2308c6aa8266d784… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 20 08:11:18 2020 -0600 ws2_32: Don't set output length in WSAStringToAddress on error. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++-- dlls/ws2_32/tests/sock.c | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8e66ab8fec..bdfe63ee19 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8514,7 +8514,6 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, res = WSAEFAULT; break; } - *lpAddressLength = sizeof(SOCKADDR_IN); memset(lpAddress, 0, sizeof(SOCKADDR_IN)); status = RtlIpv4StringToAddressExA(AddressString, FALSE, &addr4->sin_addr, &addr4->sin_port); @@ -8524,6 +8523,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, break; } addr4->sin_family = WS_AF_INET; + *lpAddressLength = sizeof(SOCKADDR_IN); break; } case WS_AF_INET6: @@ -8537,7 +8537,6 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, res = WSAEFAULT; break; } - *lpAddressLength = sizeof(SOCKADDR_IN6); memset(lpAddress, 0, sizeof(SOCKADDR_IN6)); status = RtlIpv6StringToAddressExA(AddressString, &addr6->sin6_addr, &addr6->sin6_scope_id, &addr6->sin6_port); @@ -8547,6 +8546,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, break; } addr6->sin6_family = WS_AF_INET6; + *lpAddressLength = sizeof(SOCKADDR_IN6); break; } default: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a89a964129..c72dc7a77a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3454,7 +3454,7 @@ static void test_WSAStringToAddress(void) }; WCHAR inputW[64]; - INT len, ret, expected_ret; + INT len, ret, expected_len, expected_ret; short expected_family; SOCKADDR_IN sockaddr; SOCKADDR_IN6 sockaddr6; @@ -3465,13 +3465,16 @@ static void test_WSAStringToAddress(void) ret = WSAStringToAddressA( ipv4_tests[0].input, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); ok( ret == SOCKET_ERROR, "WSAStringToAddressA() returned %d, expected SOCKET_ERROR\n", ret ); ok( WSAGetLastError() == WSAEFAULT, "WSAStringToAddress() gave error %d, expected WSAEFAULT\n", WSAGetLastError() ); + ok( len >= sizeof(sockaddr) || broken(len == 0) /* xp */, + "WSAStringToAddress() gave length %d, expected at least %d\n", len, sizeof(sockaddr) ); for (i = 0; i < 2; i++) { for (j = 0; j < ARRAY_SIZE(ipv4_tests); j++) { - len = sizeof(sockaddr); - memset( &sockaddr, 0xab, len ); + len = sizeof(sockaddr) + 10; + expected_len = ipv4_tests[j].error ? len : sizeof(sockaddr); + memset( &sockaddr, 0xab, sizeof(sockaddr) ); WSASetLastError( 0 ); if (i == 0) @@ -3500,12 +3503,16 @@ static void test_WSAStringToAddress(void) ok( sockaddr.sin_port == ipv4_tests[j].port, "WSAStringToAddress(%s) gave port %04x, expected %04x\n", wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_port, ipv4_tests[j].port ); + ok( len == expected_len, + "WSAStringToAddress(%s) gave length %d, expected %d\n", + wine_dbgstr_a( ipv4_tests[j].input ), len, expected_len ); } for (j = 0; j < ARRAY_SIZE(ipv6_tests); j++) { - len = sizeof(sockaddr6); - memset( &sockaddr6, 0xab, len ); + len = sizeof(sockaddr6) + 10; + expected_len = ipv6_tests[j].error ? len : sizeof(sockaddr6); + memset( &sockaddr6, 0xab, sizeof(sockaddr6) ); WSASetLastError( 0 ); if (i == 0) @@ -3553,6 +3560,9 @@ static void test_WSAStringToAddress(void) ok( sockaddr6.sin6_flowinfo == 0, "WSAStringToAddress(%s) gave flowinfo %d, expected 0\n", wine_dbgstr_a( ipv6_tests[j].input ), sockaddr6.sin6_flowinfo ); + ok( len == expected_len, + "WSAStringToAddress(%s) gave length %d, expected %d\n", + wine_dbgstr_a( ipv6_tests[j].input ), len, expected_len ); } } }

1 0

Henri Verbeet : wined3d: Set the correct patch vertex count for the Vulkan adapter.
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: 13e1ac0e99aa73070a65014e88dbf237c810cc65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e1ac0e99aa73070a65014e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 20 18:30:32 2020 +0430 wined3d: Set the correct patch vertex count for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 14 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 8ab0f6366c..97d05f1dc8 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1427,6 +1427,9 @@ static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wi if (a->ia_desc.primitiveRestartEnable != b->ia_desc.primitiveRestartEnable) return a->ia_desc.primitiveRestartEnable - b->ia_desc.primitiveRestartEnable; + if (a->ts_desc.patchControlPoints != b->ts_desc.patchControlPoints) + return a->ts_desc.patchControlPoints - b->ts_desc.patchControlPoints; + if ((ret = memcmp(&a->viewport, &b->viewport, sizeof(a->viewport)))) return ret; @@ -1496,6 +1499,8 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; + key->ts_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; + key->vp_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; key->vp_desc.viewportCount = 1; key->vp_desc.pViewports = &key->viewport; @@ -1526,6 +1531,7 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->pipeline_desc.pStages = key->stages; key->pipeline_desc.pVertexInputState = &key->input_desc; key->pipeline_desc.pInputAssemblyState = &key->ia_desc; + key->pipeline_desc.pTessellationState = &key->ts_desc; key->pipeline_desc.pViewportState = &key->vp_desc; key->pipeline_desc.pRasterizationState = &key->rs_desc; key->pipeline_desc.pMultisampleState = &key->ms_desc; @@ -1751,6 +1757,13 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } + if (key->ts_desc.patchControlPoints != state->patch_vertex_count) + { + key->ts_desc.patchControlPoints = state->patch_vertex_count; + + update = true; + } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_VIEWPORT) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SCISSORRECT) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3450633b61..ab5df330e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2331,6 +2331,7 @@ struct wined3d_graphics_pipeline_key_vk VkPipelineVertexInputStateCreateInfo input_desc; VkPipelineInputAssemblyStateCreateInfo ia_desc; + VkPipelineTessellationStateCreateInfo ts_desc; VkPipelineViewportStateCreateInfo vp_desc; VkPipelineRasterizationStateCreateInfo rs_desc; VkPipelineMultisampleStateCreateInfo ms_desc;

1 0

Henri Verbeet : wined3d: Store the wined3d primitive type in the wined3d state structure.
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: 51a901e34ec8b0f204acc95f6da6c4fbacd233c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51a901e34ec8b0f204acc95f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 20 18:30:28 2020 +0430 wined3d: Store the wined3d primitive type in the wined3d state structure. As opposed to the OpenGL primitive type. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 59 ++++++++++++++++++--- dlls/wined3d/cs.c | 18 +++---- dlls/wined3d/device.c | 118 +++++------------------------------------ dlls/wined3d/glsl_shader.c | 5 +- dlls/wined3d/shader.c | 6 +-- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/utils.c | 6 +-- dlls/wined3d/wined3d_private.h | 16 +++--- 8 files changed, 93 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=51a901e34ec8b0f204ac…

1 0

Gabriel Ivăncescu : winex11.drv: Fix X11DRV_X_to_window_rect to handle windows smaller than the decoration.
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: fff364274774fe51bdc8a0aee22369aac161dcb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fff364274774fe51bdc8a0ae… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue May 19 15:18:48 2020 +0300 winex11.drv: Fix X11DRV_X_to_window_rect to handle windows smaller than the decoration. A window can be resized to a smaller size than the decoration (title + borders), such as when it is minimized. In such cases it is necessary to recompute the minimum bounds, as it is done in the opposite function X11DRV_window_to_X_rect, since the real information was lost. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48490 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 595c54a7c0..a16b835424 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1209,12 +1209,16 @@ static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect, */ void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) { - x += data->window_rect.left - data->whole_rect.left; - y += data->window_rect.top - data->whole_rect.top; - cx += (data->window_rect.right - data->window_rect.left) - - (data->whole_rect.right - data->whole_rect.left); - cy += (data->window_rect.bottom - data->window_rect.top) - - (data->whole_rect.bottom - data->whole_rect.top); + RECT rc; + + get_decoration_rect( data, &rc, &data->window_rect, &data->client_rect ); + + x += min( data->window_rect.left - data->whole_rect.left, rc.left ); + y += min( data->window_rect.top - data->whole_rect.top, rc.top ); + cx += max( (data->window_rect.right - data->window_rect.left) - + (data->whole_rect.right - data->whole_rect.left), rc.right - rc.left ); + cy += max( (data->window_rect.bottom - data->window_rect.top) - + (data->whole_rect.bottom - data->whole_rect.top), rc.bottom - rc.top ); SetRect( rect, x, y, x + cx, y + cy ); }

1 0

Alexandre Julliard : ntdll: Move the Unix codepage initialization to the Unix library.
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: 3d3545b12fd2aa2f321c9ecf388f217955160e0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d3545b12fd2aa2f321c9ecf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 14:04:32 2020 +0200 ntdll: Move the Unix codepage initialization to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 125 +-------------------------------------- dlls/ntdll/unix/loader.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 3 +- 3 files changed, 154 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d3545b12fd2aa2f321c…

1 0

Henri Verbeet : wined3d: Implement different primitive topologies for the Vulkan adapter.
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: 5bd5244ba40bebb4b8f6b9558bb3843d076f871a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bd5244ba40bebb4b8f6b955… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 20 18:30:30 2020 +0430 wined3d: Implement different primitive topologies for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0295880f0a..0600cdfcec 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -185,6 +185,39 @@ static VkCullModeFlags vk_cull_mode_from_wined3d(enum wined3d_cull mode) } } +static VkPrimitiveTopology vk_topology_from_wined3d(enum wined3d_primitive_type t) +{ + switch (t) + { + case WINED3D_PT_POINTLIST: + return VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + case WINED3D_PT_LINELIST: + return VK_PRIMITIVE_TOPOLOGY_LINE_LIST; + case WINED3D_PT_LINESTRIP: + return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP; + case WINED3D_PT_TRIANGLELIST: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; + case WINED3D_PT_TRIANGLESTRIP: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP; + case WINED3D_PT_TRIANGLEFAN: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN; + case WINED3D_PT_LINELIST_ADJ: + return VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY; + case WINED3D_PT_LINESTRIP_ADJ: + return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_WITH_ADJACENCY; + case WINED3D_PT_TRIANGLELIST_ADJ: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY; + case WINED3D_PT_TRIANGLESTRIP_ADJ: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY; + case WINED3D_PT_PATCH: + return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST; + default: + FIXME("Unhandled primitive type %s.\n", debug_d3dprimitivetype(t)); + case WINED3D_PT_UNDEFINED: + return ~0u; + } +} + void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk, struct wined3d_context_vk *context_vk) { @@ -1462,7 +1495,6 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->input_desc.pVertexAttributeDescriptions = key->attributes; key->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; - key->ia_desc.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP; key->vp_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; key->vp_desc.viewportCount = 1; @@ -1644,6 +1676,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte struct wined3d_graphics_pipeline_key_vk *key; VkPipelineShaderStageCreateInfo *stage; struct wined3d_stream_info stream_info; + VkPrimitiveTopology vk_topology; VkShaderModule module; bool update = false; uint32_t mask; @@ -1708,6 +1741,14 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } + vk_topology = vk_topology_from_wined3d(state->primitive_type); + if (key->ia_desc.topology != vk_topology) + { + key->ia_desc.topology = vk_topology; + + update = true; + } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_VIEWPORT) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SCISSORRECT) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER))

1 0

Jacek Caban : winegcc: Pass only raw compiler and linker arguments in forward mode.
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: e9de7761cd6c83f296a72a35322a3d1c88ea87b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9de7761cd6c83f296a72a35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 20 17:34:53 2020 +0200 winegcc: Pass only raw compiler and linker arguments in forward mode. Fixes use case like: CC=winegcc -b i686-w64-mingw32 $CC --version Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 143910ae63..b59d9c2c81 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1462,13 +1462,10 @@ static void build(struct options* opts) static void forward(int argc, char **argv, struct options* opts) { strarray* args = strarray_alloc(); - int j; strarray_addall(args, get_translator(opts)); - - for( j = 1; j < argc; j++ ) - strarray_add(args, argv[j]); - + strarray_addall(args, opts->compiler_args); + strarray_addall(args, opts->linker_args); spawn(opts->prefix, args, 0); strarray_free (args); }

1 0