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

Chip Davis : d3d11: Implement d3d10_device_Flush().
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: a6a0f7ba8ef6f3f383880b7a060e7ac20e354da8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a0f7ba8ef6f3f383880b7a… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Thu May 21 00:12:43 2020 +0430 d3d11: Implement d3d10_device_Flush(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2092901bd4..aaeb98a205 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5252,7 +5252,13 @@ static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface) static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + wined3d_device_flush(device->wined3d_device); + wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface,

1 0

Connor McAdams : d2d1: Introduce a helper to check for Bézier segments.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: 0ff58fe1ac7b88c0bfdaa8ca8d48a9b7ce8eb6f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ff58fe1ac7b88c0bfdaa8ca… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu May 21 00:12:44 2020 +0430 d2d1: Introduce a helper to check for Bézier segments. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index c18b648aef..fb82dfea7f 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -409,6 +409,11 @@ static void d2d_point_normalise(D2D1_POINT_2F *p) d2d_point_scale(p, 1.0f / l); } +static BOOL d2d_vertex_type_is_bezier(enum d2d_vertex_type t) +{ + return (t == D2D_VERTEX_TYPE_BEZIER || t == D2D_VERTEX_TYPE_SPLIT_BEZIER); +} + /* This implementation is based on the paper "Adaptive Precision * Floating-Point Arithmetic and Fast Robust Geometric Predicates" and * associated (Public Domain) code by Jonathan Richard Shewchuk. */ @@ -1875,7 +1880,7 @@ static BOOL d2d_geometry_apply_intersections(struct d2d_geometry *geometry, figure = &geometry->u.path.figures[inter->figure_idx]; vertex_type = figure->vertex_types[inter->vertex_idx + vertex_offset]; - if (vertex_type != D2D_VERTEX_TYPE_BEZIER && vertex_type != D2D_VERTEX_TYPE_SPLIT_BEZIER) + if (!d2d_vertex_type_is_bezier(vertex_type)) { if (!d2d_figure_insert_vertex(&geometry->u.path.figures[inter->figure_idx], inter->vertex_idx + vertex_offset + 1, inter->p)) @@ -1961,9 +1966,9 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) for (idx_q.vertex_idx = 0; idx_q.vertex_idx < max_q; ++idx_q.vertex_idx) { type_q = figure_q->vertex_types[idx_q.vertex_idx]; - if (type_q == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type_q)) { - if (type_p == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type_p)) { if (!d2d_geometry_intersect_bezier_bezier(geometry, &intersections, &idx_p, 0.0f, 1.0f, &idx_q, 0.0f, 1.0f)) @@ -1978,7 +1983,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) } else { - if (type_p == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type_p)) { if (!d2d_geometry_intersect_bezier_line(geometry, &intersections, &idx_p, &idx_q)) goto done; @@ -1991,7 +1996,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) } } } - if (type_p == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type_p)) ++idx_p.control_idx; } } @@ -2328,7 +2333,7 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, if (!i) { prev_type = figure->vertex_types[figure->vertex_count - 1]; - if (prev_type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(prev_type)) prev = &figure->bezier_controls[figure->bezier_control_count - 1]; else prev = &figure->vertices[figure->vertex_count - 1]; @@ -2336,13 +2341,13 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, else { prev_type = figure->vertex_types[i - 1]; - if (prev_type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(prev_type)) prev = &figure->bezier_controls[bezier_idx - 1]; else prev = &figure->vertices[i - 1]; } - if (type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type)) next = &figure->bezier_controls[bezier_idx++]; else if (i == figure->vertex_count - 1) next = &figure->vertices[0]; @@ -2372,7 +2377,7 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, ERR("Failed to add line segment.\n"); return FALSE; } - else if (type == D2D_VERTEX_TYPE_BEZIER) + else if (d2d_vertex_type_is_bezier(type)) { const D2D1_POINT_2F *p2; @@ -2674,8 +2679,7 @@ static BOOL d2d_geometry_get_bezier_segment_idx(struct d2d_geometry *geometry, s for (; idx->vertex_idx < figure->vertex_count; ++idx->vertex_idx) { - if (figure->vertex_types[idx->vertex_idx] == D2D_VERTEX_TYPE_BEZIER - || figure->vertex_types[idx->vertex_idx] == D2D_VERTEX_TYPE_SPLIT_BEZIER) + if (d2d_vertex_type_is_bezier(figure->vertex_types[idx->vertex_idx])) return TRUE; } } @@ -3230,7 +3234,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * type = figure->vertex_types[j]; } - if (type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type)) { p1 = figure->original_bezier_controls[bezier_idx++]; d2d_point_transform(&p1, transform, p1.x, p1.y); @@ -3436,7 +3440,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *i type = figure->vertex_types[j]; } - if (type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type)) { p1 = figure->original_bezier_controls[bezier_idx++]; if (transform)

1 0

Connor McAdams : d2d1: Introduce a helper to check for split Bézier segments.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: a512a031001097008bcf506363348145e0c4bceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a512a031001097008bcf5063… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu May 21 00:12:45 2020 +0430 d2d1: Introduce a helper to check for split Bézier segments. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index fb82dfea7f..ff283563a3 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -414,6 +414,11 @@ static BOOL d2d_vertex_type_is_bezier(enum d2d_vertex_type t) return (t == D2D_VERTEX_TYPE_BEZIER || t == D2D_VERTEX_TYPE_SPLIT_BEZIER); } +static BOOL d2d_vertex_type_is_split_bezier(enum d2d_vertex_type t) +{ + return t == D2D_VERTEX_TYPE_SPLIT_BEZIER; +} + /* This implementation is based on the paper "Adaptive Precision * Floating-Point Arithmetic and Fast Robust Geometric Predicates" and * associated (Public Domain) code by Jonathan Richard Shewchuk. */ @@ -3202,7 +3207,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * for (bezier_idx = 0, ++j; j < figure->vertex_count; ++j) { if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE - || figure->vertex_types[j] == D2D_VERTEX_TYPE_SPLIT_BEZIER) + || d2d_vertex_type_is_split_bezier(figure->vertex_types[j])) continue; switch (type) @@ -3405,7 +3410,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *i for (bezier_idx = 0, ++j; j < figure->vertex_count; ++j) { if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE - || figure->vertex_types[j] == D2D_VERTEX_TYPE_SPLIT_BEZIER) + || d2d_vertex_type_is_split_bezier(figure->vertex_types[j])) continue; switch (type)

1 0

Connor McAdams : d2d1: Allow inserting multiple Bézier control points into a figure at once.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: e3bbeb5a933af913c2d43ddd111c9fc1c9ce1074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3bbeb5a933af913c2d43ddd… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu May 21 00:12:46 2020 +0430 d2d1: Allow inserting multiple Bézier control points into a figure at once. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index ff283563a3..340bc604c4 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -623,19 +623,20 @@ static BOOL d2d_figure_add_vertex(struct d2d_figure *figure, D2D1_POINT_2F verte return TRUE; } -static BOOL d2d_figure_insert_bezier_control(struct d2d_figure *figure, size_t idx, const D2D1_POINT_2F *p) +static BOOL d2d_figure_insert_bezier_controls(struct d2d_figure *figure, + size_t idx, size_t count, const D2D1_POINT_2F *p) { if (!d2d_array_reserve((void **)&figure->bezier_controls, &figure->bezier_controls_size, - figure->bezier_control_count + 1, sizeof(*figure->bezier_controls))) + figure->bezier_control_count + count, sizeof(*figure->bezier_controls))) { ERR("Failed to grow bezier controls array.\n"); return FALSE; } - memmove(&figure->bezier_controls[idx + 1], &figure->bezier_controls[idx], + memmove(&figure->bezier_controls[idx + count], &figure->bezier_controls[idx], (figure->bezier_control_count - idx) * sizeof(*figure->bezier_controls)); - figure->bezier_controls[idx] = *p; - ++figure->bezier_control_count; + memcpy(&figure->bezier_controls[idx], p, count * sizeof(*figure->bezier_controls)); + figure->bezier_control_count += count; return TRUE; } @@ -1918,7 +1919,7 @@ static BOOL d2d_geometry_apply_intersections(struct d2d_geometry *geometry, d2d_point_lerp(&q[1], p[1], p[2], t); figure->bezier_controls[inter->control_idx + control_offset] = q[0]; - if (!(d2d_figure_insert_bezier_control(figure, inter->control_idx + control_offset + 1, &q[1]))) + if (!(d2d_figure_insert_bezier_controls(figure, inter->control_idx + control_offset + 1, 1, &q[1]))) return FALSE; ++control_offset; @@ -2824,7 +2825,7 @@ static BOOL d2d_geometry_split_bezier(struct d2d_geometry *geometry, const struc d2d_point_lerp(&q[2], &q[0], &q[1], 0.5f); figure->bezier_controls[idx->control_idx] = q[0]; - if (!(d2d_figure_insert_bezier_control(figure, idx->control_idx + 1, &q[1]))) + if (!(d2d_figure_insert_bezier_controls(figure, idx->control_idx + 1, 1, &q[1]))) return FALSE; if (!(d2d_figure_insert_vertex(figure, idx->vertex_idx + 1, q[2]))) return FALSE;

1 0

Connor McAdams : d2d1: Allow appending multiple Bézier control points to a figure at once.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: fe4e6934a937645cea4fece505c0e1acaf2dfc07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe4e6934a937645cea4fece5… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu May 21 00:12:47 2020 +0430 d2d1: Allow appending multiple Bézier control points to a figure at once. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 340bc604c4..9c5e653f56 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -641,16 +641,17 @@ static BOOL d2d_figure_insert_bezier_controls(struct d2d_figure *figure, return TRUE; } -static BOOL d2d_figure_add_bezier_control(struct d2d_figure *figure, const D2D1_POINT_2F *p) +static BOOL d2d_figure_add_bezier_controls(struct d2d_figure *figure, size_t count, const D2D1_POINT_2F *p) { if (!d2d_array_reserve((void **)&figure->bezier_controls, &figure->bezier_controls_size, - figure->bezier_control_count + 1, sizeof(*figure->bezier_controls))) + figure->bezier_control_count + count, sizeof(*figure->bezier_controls))) { ERR("Failed to grow bezier controls array.\n"); return FALSE; } - figure->bezier_controls[figure->bezier_control_count++] = *p; + memcpy(&figure->bezier_controls[figure->bezier_control_count], p, count * sizeof(*figure->bezier_controls)); + figure->bezier_control_count += count; return TRUE; } @@ -2597,7 +2598,7 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *if d2d_rect_get_bezier_bounds(&bezier_bounds, &figure->vertices[figure->vertex_count - 1], &p, &beziers[i].point3); - if (!d2d_figure_add_bezier_control(figure, &p)) + if (!d2d_figure_add_bezier_controls(figure, 1, &p)) { ERR("Failed to add bezier control.\n"); geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; @@ -3013,7 +3014,7 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBeziers(ID2D1Geometr &beziers[i].point1, &beziers[i].point2); figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_BEZIER; - if (!d2d_figure_add_bezier_control(figure, &beziers[i].point1)) + if (!d2d_figure_add_bezier_controls(figure, 1, &beziers[i].point1)) { ERR("Failed to add bezier.\n"); geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR;

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

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

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

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: 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