- Wine-Commits - list.winehq.org

Zebediah Figura : winemac: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: f605add4fde2d94f029145573b72ee87fdc65bea URL: https://gitlab.winehq.org/wine/wine/-/commit/f605add4fde2d94f029145573b72ee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 18:09:03 2023 -0600 winemac: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough. --- dlls/winemac.drv/opengl.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 6f3c3b88155..55e5704724b 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1525,7 +1525,7 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns * * Implementation of wglSetPixelFormat and wglSetPixelFormatWINE. */ -static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) +static BOOL set_pixel_format(HDC hdc, int fmt, BOOL internal) { struct macdrv_win_data *data; const pixel_format *pf; @@ -1540,16 +1540,19 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) return FALSE; } - if (!(data = get_win_data(hwnd))) + if (!internal) { - FIXME("DC for window %p of other process: not implemented\n", hwnd); - return FALSE; + /* cannot change it if already set */ + int prev = win32u_get_window_pixel_format( hwnd ); + + if (prev) + return prev == fmt; } - if (!allow_reset && data->pixel_format) /* cannot change it if already set */ + if (!(data = get_win_data(hwnd))) { - ret = (data->pixel_format == fmt); - goto done; + FIXME("DC for window %p of other process: not implemented\n", hwnd); + return FALSE; } /* Check if fmt is in our list of supported formats to see if it is supported. */ @@ -1588,7 +1591,7 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) done: release_win_data(data); if (ret && gl_surface_mode == GL_SURFACE_BEHIND) - win32u_set_window_pixel_format(hwnd, fmt, FALSE); + win32u_set_window_pixel_format(hwnd, fmt, internal); return ret; }

1 0

Zebediah Figura : wined3d: Do not set the pixel format if wglGetPixelFormat() returns zero and we already set the internal pixel format.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 8da023fe8ccb18baa65a41d331ba0539b6f42eba URL: https://gitlab.winehq.org/wine/wine/-/commit/8da023fe8ccb18baa65a41d331ba05… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 19:25:09 2023 -0600 wined3d: Do not set the pixel format if wglGetPixelFormat() returns zero and we already set the internal pixel format. Currently this does nothing, because wglGetPixelFormat() returns the pixel format set by wglSetPixelFormatWINE(). However, with the following changes to WGL_WINE_pixel_format_passthrough, wglGetPixelFormat() will only return the pixel format set by wglSetPixelFormat(). Hence we should avoid trying to set the "internal" pixel format more than once. --- dlls/wined3d/context_gl.c | 15 +++++++++++---- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 27969f0b5c9..240eaec349c 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1210,7 +1210,8 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte return FALSE; current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); - if (current == format) goto success; + if ((current == format) || (!current && context_gl->internal_format_set)) + goto success; /* By default WGL doesn't allow pixel format adjustments but we need it * here. For this reason there's a Wine specific wglSetPixelFormat() @@ -1225,6 +1226,7 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte format, dc); return FALSE; } + context_gl->internal_format_set = 1; } else if (current) { @@ -1346,6 +1348,7 @@ static void wined3d_context_gl_update_window(struct wined3d_context_gl *context_ context_gl->dc_has_format = FALSE; context_gl->needs_set = 1; context_gl->valid = 1; + context_gl->internal_format_set = 0; if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) { @@ -1673,9 +1676,13 @@ static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) context_gl->restore_dc = wglGetCurrentDC(); context_gl->needs_set = 1; } - else if (!context_gl->needs_set && !(context_gl->dc_is_private && context_gl->dc_has_format) - && context_gl->pixel_format != context_gl->gl_info->gl_ops.wgl.p_wglGetPixelFormat(context_gl->dc)) - context_gl->needs_set = 1; + else if (!context_gl->needs_set && !(context_gl->dc_is_private && context_gl->dc_has_format)) + { + int current = context_gl->gl_info->gl_ops.wgl.p_wglGetPixelFormat(context_gl->dc); + + if ((current && current != context_gl->pixel_format) || (!current && !context_gl->internal_format_set)) + context_gl->needs_set = 1; + } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c0a190cbc5c..425261a195e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2346,8 +2346,9 @@ struct wined3d_context_gl uint32_t rebind_fbo : 1; uint32_t untracked_material_count : 2; /* Max value 2 */ uint32_t needs_set : 1; + uint32_t internal_format_set : 1; uint32_t valid : 1; - uint32_t padding : 23; + uint32_t padding : 22; uint32_t default_attrib_value_set;

1 0

Zebediah Figura : winemac: Retrieve the pixel format from win32u for normal windows in wglGetPixelFormat().
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 15f03ac3cbf71d4269f5d88d53787776b115abd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/15f03ac3cbf71d4269f5d88d537877… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 14:23:15 2023 -0600 winemac: Retrieve the pixel format from win32u for normal windows in wglGetPixelFormat(). --- dlls/winemac.drv/opengl.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 7251745258a..d92276bf253 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1329,12 +1329,11 @@ static BOOL init_gl_info(void) } -static int get_dc_pixel_format(HDC hdc) +static int get_dc_pixel_format(HWND hwnd, HDC hdc) { int format; - HWND hwnd; - if ((hwnd = NtUserWindowFromDC(hdc))) + if (hwnd) { struct macdrv_win_data *data; @@ -2719,7 +2718,7 @@ static struct wgl_context *macdrv_wglCreateContextAttribsARB(HDC hdc, TRACE("hdc %p, share_context %p, attrib_list %p\n", hdc, share_context, attrib_list); - format = get_dc_pixel_format(hdc); + format = get_dc_pixel_format(NtUserWindowFromDC(hdc), hdc); if (!is_valid_pixel_format(format)) { @@ -4417,8 +4416,12 @@ static BOOL macdrv_wglDeleteContext(struct wgl_context *context) static int macdrv_wglGetPixelFormat(HDC hdc) { int format; + HWND hwnd; + + if ((hwnd = NtUserWindowFromDC( hdc ))) + return win32u_get_window_pixel_format( hwnd ); - format = get_dc_pixel_format(hdc); + format = get_dc_pixel_format(NULL, hdc); if (!is_valid_pixel_format(format)) /* not set yet */ format = 0;

1 0

Zebediah Figura : win32u: Introduce a win32u_get_window_pixel_format() helper.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 463a11379bc19beb566fd86ea1617b54a8f8381a URL: https://gitlab.winehq.org/wine/wine/-/commit/463a11379bc19beb566fd86ea1617b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 14:01:54 2023 -0600 win32u: Introduce a win32u_get_window_pixel_format() helper. --- dlls/win32u/window.c | 17 +++++++++++++++++ include/wine/gdi_driver.h | 1 + 2 files changed, 18 insertions(+) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index cd8b6583249..a3c46dfdf31 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1457,6 +1457,23 @@ BOOL win32u_set_window_pixel_format( HWND hwnd, int format ) return TRUE; } +int win32u_get_window_pixel_format( HWND hwnd ) +{ + WND *win = get_win_ptr( hwnd ); + int ret; + + if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) + { + WARN( "getting format on win %p not supported\n", hwnd ); + return 0; + } + + ret = win->pixel_format; + release_win_ptr( win ); + + return ret; +} + /*********************************************************************** * NtUserGetProp (win32u.@) * diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 5ecd54c70f3..eefefce695b 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -340,6 +340,7 @@ struct user_driver_funcs extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format ); +extern int win32u_get_window_pixel_format( HWND hwnd ); #endif /* WINE_UNIX_LIB */

1 0

Zebediah Figura : winex11: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 46c8a637525d0f1cf67830295fb460c819b800b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/46c8a637525d0f1cf67830295fb460… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 16:23:42 2023 -0600 winex11: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough. --- dlls/d3d8/tests/device.c | 6 +++--- dlls/d3d9/tests/device.c | 6 +++--- dlls/ddraw/tests/ddraw1.c | 6 +++--- dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 6 +++--- dlls/ddraw/tests/ddraw7.c | 6 +++--- dlls/winex11.drv/opengl.c | 26 +++++++++++--------------- 7 files changed, 29 insertions(+), 33 deletions(-)

1 0

Zebediah Figura : win32u: Allow separately storing the internal pixel format set by WGL_WINE_pixel_format_passthrough.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: c2018ff466120ff2706c166ec66aea66ecea1683 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2018ff466120ff2706c166ec66aea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 16:17:44 2023 -0600 win32u: Allow separately storing the internal pixel format set by WGL_WINE_pixel_format_passthrough. --- dlls/win32u/ntuser_private.h | 1 + dlls/win32u/window.c | 10 +++++++--- dlls/wineandroid.drv/opengl.c | 2 +- dlls/winemac.drv/opengl.c | 3 ++- dlls/winex11.drv/opengl.c | 4 ++-- include/wine/gdi_driver.h | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 385e7c0ded5..5c337c722a7 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -90,6 +90,7 @@ typedef struct tagWND struct window_surface *surface; /* Window surface if any */ struct tagDIALOGINFO *dlgInfo; /* Dialog additional info (dialogs only) */ int pixel_format; /* Pixel format set by the graphics driver */ + int internal_pixel_format; /* Internal pixel format set via WGL_WINE_pixel_format_passthrough */ int cbWndExtra; /* class cbWndExtra at window creation */ DWORD_PTR userdata; /* User private data */ DWORD wExtra[1]; /* Window extra bytes */ diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index a3c46dfdf31..4db9d99884c 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1441,7 +1441,7 @@ LONG_PTR WINAPI NtUserSetWindowLongPtr( HWND hwnd, INT offset, LONG_PTR newval, return set_window_long( hwnd, offset, sizeof(LONG_PTR), newval, ansi ); } -BOOL win32u_set_window_pixel_format( HWND hwnd, int format ) +BOOL win32u_set_window_pixel_format( HWND hwnd, int format, BOOL internal ) { WND *win = get_win_ptr( hwnd ); @@ -1450,7 +1450,10 @@ BOOL win32u_set_window_pixel_format( HWND hwnd, int format ) WARN( "setting format %d on win %p not supported\n", format, hwnd ); return FALSE; } - win->pixel_format = format; + if (internal) + win->internal_pixel_format = format; + else + win->pixel_format = format; release_win_ptr( win ); update_window_state( hwnd ); @@ -1852,7 +1855,8 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, wine_server_add_data( req, extra_rects, sizeof(extra_rects) ); } if (new_surface) req->paint_flags |= SET_WINPOS_PAINT_SURFACE; - if (win->pixel_format) req->paint_flags |= SET_WINPOS_PIXEL_FORMAT; + if (win->pixel_format || win->internal_pixel_format) + req->paint_flags |= SET_WINPOS_PIXEL_FORMAT; if ((ret = !wine_server_call( req ))) { diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 37e9c713fb1..c8b7bf85cfb 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -242,7 +242,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) release_gl_drawable( gl ); if (prev && prev != format && !allow_change) return FALSE; - if (win32u_set_window_pixel_format( hwnd, format )) return TRUE; + if (win32u_set_window_pixel_format( hwnd, format, FALSE )) return TRUE; destroy_gl_drawable( hwnd ); return FALSE; } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index d92276bf253..6f3c3b88155 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1587,7 +1587,8 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) done: release_win_data(data); - if (ret && gl_surface_mode == GL_SURFACE_BEHIND) win32u_set_window_pixel_format(hwnd, fmt); + if (ret && gl_surface_mode == GL_SURFACE_BEHIND) + win32u_set_window_pixel_format(hwnd, fmt, FALSE); return ret; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 92768267bae..3006d1a2447 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1402,7 +1402,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format, BO XFlush( gdi_display ); release_gl_drawable( gl ); - win32u_set_window_pixel_format( hwnd, pixel_format_index( format )); + win32u_set_window_pixel_format( hwnd, pixel_format_index( format ), FALSE ); return TRUE; } @@ -1512,7 +1512,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) else { destroy_gl_drawable( hwnd ); - win32u_set_window_pixel_format( hwnd, 0 ); + win32u_set_window_pixel_format( hwnd, 0, FALSE ); } release_gl_drawable( old ); } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index eefefce695b..c492252d4ab 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -339,7 +339,7 @@ struct user_driver_funcs extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); -extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format ); +extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format, BOOL internal ); extern int win32u_get_window_pixel_format( HWND hwnd ); #endif /* WINE_UNIX_LIB */

1 0

Zebediah Figura : wineandroid: Retrieve the pixel format from win32u for normal windows in wglGetPixelFormat().
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 899f010232c1ace8d6963d85b673803aaa6da520 URL: https://gitlab.winehq.org/wine/wine/-/commit/899f010232c1ace8d6963d85b67380… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 14:16:59 2023 -0600 wineandroid: Retrieve the pixel format from win32u for normal windows in wglGetPixelFormat(). --- dlls/wineandroid.drv/opengl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 41df3d3c09c..37e9c713fb1 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -497,8 +497,14 @@ static int android_wglGetPixelFormat( HDC hdc ) { struct gl_drawable *gl; int ret = 0; + HWND hwnd; + + if ((hwnd = NtUserWindowFromDC( hdc ))) + return win32u_get_window_pixel_format( hwnd ); - if ((gl = get_gl_drawable( NtUserWindowFromDC( hdc ), hdc ))) + /* This code is currently dead, but will be necessary if WGL_ARB_pbuffer + * support is introduced. */ + if ((gl = get_gl_drawable( NULL, hdc ))) { ret = gl->format; /* offscreen formats can't be used with traditional WGL calls */

1 0

Zebediah Figura : winex11: Retrieve the pixel format from win32u for normal windows in wglGetPixelFormat().
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 775a2d5f4cc9a84bd9473d5fd81c67f29a62583f URL: https://gitlab.winehq.org/wine/wine/-/commit/775a2d5f4cc9a84bd9473d5fd81c67… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 14:03:48 2023 -0600 winex11: Retrieve the pixel format from win32u for normal windows in wglGetPixelFormat(). --- dlls/winex11.drv/opengl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 783ac5f3a9d..92768267bae 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1687,8 +1687,12 @@ static int glxdrv_wglGetPixelFormat( HDC hdc ) { struct gl_drawable *gl; int ret = 0; + HWND hwnd; - if ((gl = get_gl_drawable( NtUserWindowFromDC( hdc ), hdc ))) + if ((hwnd = NtUserWindowFromDC( hdc ))) + return win32u_get_window_pixel_format( hwnd ); + + if ((gl = get_gl_drawable( NULL, hdc ))) { ret = pixel_format_index( gl->format ); /* Offscreen formats can't be used with traditional WGL calls.

1 0

Zebediah Figura : win32u: Make NtUserSetWindowPixelFormat() into a proper export.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: b545ca0f9b0cdc5f814d41d892bbc5f8e7dc4fa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b545ca0f9b0cdc5f814d41d892bbc5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 20:10:29 2023 -0600 win32u: Make NtUserSetWindowPixelFormat() into a proper export. This is simpler in general, given that this function is no longer used from user-space. In this particular case, the secondary purpose is to allow easily adding arguments to the function. --- dlls/win32u/window.c | 5 +---- dlls/wineandroid.drv/opengl.c | 2 +- dlls/winemac.drv/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 4 ++-- include/ntuser.h | 6 ------ include/wine/gdi_driver.h | 2 ++ 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index a3ff0647dcd..cd8b6583249 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1441,7 +1441,7 @@ LONG_PTR WINAPI NtUserSetWindowLongPtr( HWND hwnd, INT offset, LONG_PTR newval, return set_window_long( hwnd, offset, sizeof(LONG_PTR), newval, ansi ); } -static BOOL set_window_pixel_format( HWND hwnd, int format ) +BOOL win32u_set_window_pixel_format( HWND hwnd, int format ) { WND *win = get_win_ptr( hwnd ); @@ -5555,9 +5555,6 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_SetWindowContextHelpId: return set_window_context_help_id( hwnd, param ); - case NtUserCallHwndParam_SetWindowPixelFormat: - return set_window_pixel_format( hwnd, param ); - case NtUserCallHwndParam_ShowOwnedPopups: return show_owned_popups( hwnd, param ); diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index a930e249ba5..41df3d3c09c 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -242,7 +242,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) release_gl_drawable( gl ); if (prev && prev != format && !allow_change) return FALSE; - if (NtUserSetWindowPixelFormat( hwnd, format )) return TRUE; + if (win32u_set_window_pixel_format( hwnd, format )) return TRUE; destroy_gl_drawable( hwnd ); return FALSE; } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ff78b183360..7251745258a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1588,7 +1588,7 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) done: release_win_data(data); - if (ret && gl_surface_mode == GL_SURFACE_BEHIND) NtUserSetWindowPixelFormat(hwnd, fmt); + if (ret && gl_surface_mode == GL_SURFACE_BEHIND) win32u_set_window_pixel_format(hwnd, fmt); return ret; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c44e9579cb6..783ac5f3a9d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1402,7 +1402,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format, BO XFlush( gdi_display ); release_gl_drawable( gl ); - NtUserSetWindowPixelFormat( hwnd, pixel_format_index( format )); + win32u_set_window_pixel_format( hwnd, pixel_format_index( format )); return TRUE; } @@ -1512,7 +1512,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) else { destroy_gl_drawable( hwnd ); - NtUserSetWindowPixelFormat( hwnd, 0 ); + win32u_set_window_pixel_format( hwnd, 0 ); } release_gl_drawable( old ); } diff --git a/include/ntuser.h b/include/ntuser.h index 3b821f0c9fe..35ead9750c6 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1331,7 +1331,6 @@ enum NtUserCallHwndParam_SetDialogInfo, NtUserCallHwndParam_SetMDIClientInfo, NtUserCallHwndParam_SetWindowContextHelpId, - NtUserCallHwndParam_SetWindowPixelFormat, NtUserCallHwndParam_ShowOwnedPopups, /* temporary exports */ NtUserSetWindowStyle, @@ -1498,11 +1497,6 @@ static inline BOOL NtUserSetWindowContextHelpId( HWND hwnd, DWORD id ) return NtUserCallHwndParam( hwnd, id, NtUserCallHwndParam_SetWindowContextHelpId ); } -static inline BOOL NtUserSetWindowPixelFormat( HWND hwnd, int format ) -{ - return NtUserCallHwndParam( hwnd, format, NtUserCallHwndParam_SetWindowPixelFormat ); -} - static inline BOOL NtUserShowOwnedPopups( HWND hwnd, BOOL show ) { return NtUserCallHwndParam( hwnd, show, NtUserCallHwndParam_ShowOwnedPopups ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index dca03934a44..5ecd54c70f3 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -339,6 +339,8 @@ struct user_driver_funcs extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); +extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format ); + #endif /* WINE_UNIX_LIB */ #endif /* __WINE_WINE_GDI_DRIVER_H */

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Use array element type for array's regset.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: vkd3d Branch: master Commit: 193692bbcbaf6fbcd8138ae8f0b0c6995d5b02c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/193692bbcbaf6fbcd8138ae8f0b0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 02:47:59 2023 +0100 vkd3d-shader/hlsl: Use array element type for array's regset. Currently this affects SM1 compilation only, with a minimal example like this: float4 var[3]; float4 main() : sv_target { return var[1]; } --- libs/vkd3d-shader/hlsl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a62a76de..286c6e60 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -203,6 +203,8 @@ enum hlsl_regset hlsl_type_get_regset(const struct hlsl_type *type) vkd3d_unreachable(); } } + else if (type->type == HLSL_CLASS_ARRAY) + return hlsl_type_get_regset(type->e.array.type); vkd3d_unreachable(); }

1 0