wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

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

20 May '20

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

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

20 May '20

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

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

20 May '20

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

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

20 May '20

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: Implement primitive restart for the Vulkan adapter.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: 99f4f16b9263bb6144ea53e7a170345dc2815129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99f4f16b9263bb6144ea53e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 20 18:30:31 2020 +0430 wined3d: Implement primitive restart 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 | 2 ++ dlls/wined3d/wined3d_private.h | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0600cdfcec..8ab0f6366c 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1745,6 +1745,8 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte if (key->ia_desc.topology != vk_topology) { key->ia_desc.topology = vk_topology; + key->ia_desc.primitiveRestartEnable = !(d3d_info->wined3d_creation_flags & WINED3D_NO_PRIMITIVE_RESTART) + && !wined3d_primitive_type_is_list(state->primitive_type); update = true; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f40a33132..3450633b61 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5949,6 +5949,16 @@ static inline VkImageAspectFlags vk_aspect_mask_from_format(const struct wined3d return mask; } +static inline bool wined3d_primitive_type_is_list(enum wined3d_primitive_type t) +{ + return t == WINED3D_PT_POINTLIST + || t == WINED3D_PT_LINELIST + || t == WINED3D_PT_TRIANGLELIST + || t == WINED3D_PT_LINELIST_ADJ + || t == WINED3D_PT_TRIANGLELIST_ADJ + || t == WINED3D_PT_PATCH; +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"

1 0

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

20 May '20

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

Henri Verbeet : wined3d: Store the wined3d patch vertex count in the wined3d state structure.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: f8acf0b97d77aea2bfd6b714883b79ce5205abf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8acf0b97d77aea2bfd6b714… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 20 18:30:29 2020 +0430 wined3d: Store the wined3d patch vertex count in the wined3d state structure. As opposed to the OpenGL patch vertex count. These are of course the same, so this is only a semantic change. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 16 ++++++++-------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index c4f14d24bb..08a90e3663 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4602,7 +4602,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (state->primitive_type == WINED3D_PT_PATCH) { - GL_EXTCALL(glPatchParameteri(GL_PATCH_VERTICES, state->gl_patch_vertices)); + GL_EXTCALL(glPatchParameteri(GL_PATCH_VERTICES, state->patch_vertex_count)); checkGLcall("glPatchParameteri"); } diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9b50948d01..113b8ff84f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -889,7 +889,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) device_invalidate_state(cs->device, STATE_POINT_ENABLE); state->primitive_type = op->primitive_type; } - state->gl_patch_vertices = op->patch_vertex_count; + state->patch_vertex_count = op->patch_vertex_count; cs->device->adapter->adapter_ops->adapter_draw_primitive(cs->device, state, &op->parameters); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 72bd403e2c..6f7ab23e60 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3977,7 +3977,7 @@ void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, device, debug_d3dprimitivetype(primitive_type), patch_vertex_count); device->state.primitive_type = primitive_type; - device->state.gl_patch_vertices = patch_vertex_count; + device->state.patch_vertex_count = patch_vertex_count; } void CDECL wined3d_device_get_primitive_type(const struct wined3d_device *device, @@ -3988,7 +3988,7 @@ void CDECL wined3d_device_get_primitive_type(const struct wined3d_device *device *primitive_type = device->state.primitive_type; if (patch_vertex_count) - *patch_vertex_count = device->state.gl_patch_vertices; + *patch_vertex_count = device->state.patch_vertex_count; TRACE("Returning %s.\n", debug_d3dprimitivetype(*primitive_type)); } @@ -3998,7 +3998,7 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT TRACE("device %p, start_vertex %u, vertex_count %u.\n", device, start_vertex, vertex_count); wined3d_cs_emit_draw(device->cs, device->state.primitive_type, - device->state.gl_patch_vertices, 0, start_vertex, vertex_count, 0, 0, false); + device->state.patch_vertex_count, 0, start_vertex, vertex_count, 0, 0, false); return WINED3D_OK; } @@ -4009,7 +4009,7 @@ void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device TRACE("device %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", device, start_vertex, vertex_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.gl_patch_vertices, + wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.patch_vertex_count, 0, start_vertex, vertex_count, start_instance, instance_count, false); } @@ -4019,7 +4019,7 @@ void CDECL wined3d_device_draw_primitive_instanced_indirect(struct wined3d_devic TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); wined3d_cs_emit_draw_indirect(device->cs, device->state.primitive_type, - device->state.gl_patch_vertices, buffer, offset, false); + device->state.patch_vertex_count, buffer, offset, false); } HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) @@ -4036,7 +4036,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.gl_patch_vertices, + wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.patch_vertex_count, device->state.base_vertex_index, start_idx, index_count, 0, 0, true); return WINED3D_OK; @@ -4048,7 +4048,7 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", device, start_idx, index_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.gl_patch_vertices, + wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.patch_vertex_count, device->state.base_vertex_index, start_idx, index_count, start_instance, instance_count, true); } @@ -4058,7 +4058,7 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); wined3d_cs_emit_draw_indirect(device->cs, device->state.primitive_type, - device->state.gl_patch_vertices, buffer, offset, true); + device->state.patch_vertex_count, buffer, offset, true); } HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1ce8e83899..4272d5aef2 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1819,7 +1819,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d get_identity_matrix(&identity); state->primitive_type = WINED3D_PT_UNDEFINED; - state->gl_patch_vertices = 0; + state->patch_vertex_count = 0; /* Set some of the defaults for lights, transforms etc */ state->transforms[WINED3D_TS_PROJECTION] = identity; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 42b558a8ae..9f40a33132 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3489,7 +3489,7 @@ struct wined3d_state int base_vertex_index; int load_base_vertex_index; /* Non-indexed drawing needs 0 here, indexed needs base_vertex_index. */ enum wined3d_primitive_type primitive_type; - GLint gl_patch_vertices; + unsigned int patch_vertex_count; struct wined3d_query *predicate; BOOL predicate_value;

1 0

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

20 May '20

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

Alexandre Julliard : ntdll: Move setting the process name to the Unix library.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: acd209d6039f2492bdc8aca3d15bb1b268b04f1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=acd209d6039f2492bdc8aca3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 15:51:19 2020 +0200 ntdll: Move setting the process name to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 65 ---------------------------------------------- dlls/ntdll/unix/loader.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 65 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index a5e1fadac9..238a63aad0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -28,9 +28,6 @@ #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif -#ifdef HAVE_SYS_PRCTL_H -# include <sys/prctl.h> -#endif #ifdef HAVE_SYS_TIMES_H #include <sys/times.h> #endif @@ -187,67 +184,6 @@ int __cdecl __wine_dbg_output( const char *str ) return unix_funcs->dbg_output( str ); } -/*********************************************************************** - * set_process_name - * - * Change the process name in the ps output. - */ -static void set_process_name( int argc, char *argv[] ) -{ - BOOL shift_strings; - char *p, *name; - int i; - -#ifdef HAVE_SETPROCTITLE - setproctitle("-%s", argv[1]); - shift_strings = FALSE; -#else - p = argv[0]; - - shift_strings = (argc >= 2); - for (i = 1; i < argc; i++) - { - p += strlen(p) + 1; - if (p != argv[i]) - { - shift_strings = FALSE; - break; - } - } -#endif - - if (shift_strings) - { - int offset = argv[1] - argv[0]; - char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; - memmove( argv[0], argv[1], end - argv[1] ); - memset( end - offset, 0, offset ); - for (i = 1; i < argc; i++) - argv[i-1] = argv[i] - offset; - argv[i-1] = NULL; - } - else - { - /* remove argv[0] */ - memmove( argv, argv + 1, argc * sizeof(argv[0]) ); - } - - name = argv[0]; - if ((p = strrchr( name, '\\' ))) name = p + 1; - if ((p = strrchr( name, '/' ))) name = p + 1; - -#if defined(HAVE_SETPROGNAME) - setprogname( name ); -#endif - -#ifdef HAVE_PRCTL -#ifndef PR_SET_NAME -# define PR_SET_NAME 15 -#endif - prctl( PR_SET_NAME, name ); -#endif /* HAVE_PRCTL */ -} - HANDLE user_shared_data_init_done(void) { static const WCHAR wine_usdW[] = {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', @@ -382,7 +318,6 @@ TEB *thread_init(void) unix_funcs->dbg_init(); unix_funcs->get_paths( &build_dir, &data_dir, &config_dir ); - set_process_name( __wine_main_argc, __wine_main_argv ); /* initialize time values in user_shared_data */ NtQuerySystemTime( &now ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 1ba6f686fb..d4480e86f0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -38,6 +38,9 @@ #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif +#ifdef HAVE_SYS_PRCTL_H +# include <sys/prctl.h> +#endif #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif @@ -1192,6 +1195,68 @@ static int pre_exec(void) #endif +/*********************************************************************** + * set_process_name + * + * Change the process name in the ps output. + */ +static void set_process_name( int argc, char *argv[] ) +{ + BOOL shift_strings; + char *p, *name; + int i; + +#ifdef HAVE_SETPROCTITLE + setproctitle("-%s", argv[1]); + shift_strings = FALSE; +#else + p = argv[0]; + + shift_strings = (argc >= 2); + for (i = 1; i < argc; i++) + { + p += strlen(p) + 1; + if (p != argv[i]) + { + shift_strings = FALSE; + break; + } + } +#endif + + if (shift_strings) + { + int offset = argv[1] - argv[0]; + char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; + memmove( argv[0], argv[1], end - argv[1] ); + memset( end - offset, 0, offset ); + for (i = 1; i < argc; i++) + argv[i-1] = argv[i] - offset; + argv[i-1] = NULL; + } + else + { + /* remove argv[0] */ + memmove( argv, argv + 1, argc * sizeof(argv[0]) ); + } + + name = argv[0]; + if ((p = strrchr( name, '\\' ))) name = p + 1; + if ((p = strrchr( name, '/' ))) name = p + 1; + +#if defined(HAVE_SETPROGNAME) + setprogname( name ); +#endif + +#ifdef HAVE_PRCTL +#ifndef PR_SET_NAME +# define PR_SET_NAME 15 +#endif + prctl( PR_SET_NAME, name ); +#endif /* HAVE_PRCTL */ +} + + /*********************************************************************** * check_command_line * @@ -1260,6 +1325,7 @@ void __wine_main( int argc, char *argv[], char *envp[] ) module = load_ntdll(); fixup_ntdll_imports( &__wine_spec_nt_header, module ); + set_process_name( argc, argv ); init_unix_codepage(); #ifdef __APPLE__ @@ -1294,6 +1360,7 @@ NTSTATUS __cdecl __wine_init_unix_lib( HMODULE module, const void *ptr_in, void map_so_dll( nt, module ); fixup_ntdll_imports( &__wine_spec_nt_header, module ); + set_process_name( __wine_main_argc, __wine_main_argv ); init_unix_codepage(); *(struct unix_funcs **)ptr_out = &unix_funcs; wine_mmap_enum_reserved_areas( add_area, NULL, 0 );

1 0

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

20 May '20

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

← Newer
1
...
27
28
29
30
31
32
33
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2020