[PATCH 0/6] MR7721: win32u: Add a generic wgl(Get|Set)PixelFormat(WINE) implementation.
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/opengl.c | 114 +++++++++++++++++++++++++++-------- include/wine/opengl_driver.h | 1 + 2 files changed, 91 insertions(+), 24 deletions(-) diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c index c3245945446..693ec8b9517 100644 --- a/dlls/win32u/opengl.c +++ b/dlls/win32u/opengl.c @@ -284,26 +284,14 @@ static BOOL osmesa_wglDeleteContext( struct wgl_context *context ) return osmesa_delete_context( context ); } -static int osmesa_wglGetPixelFormat( HDC hdc ) -{ - DC *dc = get_dc_ptr( hdc ); - int ret = 0; - - if (dc) - { - ret = dc->pixel_format; - release_dc_ptr( dc ); - } - return ret; -} - static struct wgl_context *osmesa_wglCreateContext( HDC hdc ) { PIXELFORMATDESCRIPTOR descr; - int format = osmesa_wglGetPixelFormat( hdc ); + struct opengl_funcs *funcs; + int format; - if (!format) format = 1; - if (format <= 0 || format > ARRAY_SIZE( pixel_formats )) return NULL; + if (!(funcs = get_dc_funcs( hdc, NULL ))) return NULL; + if (!(format = funcs->p_wglGetPixelFormat( hdc ))) format = 1; describe_pixel_format( format, &descr ); return osmesa_create_context( hdc, &descr ); @@ -346,12 +334,6 @@ static BOOL osmesa_wglMakeCurrent( HDC hdc, struct wgl_context *context ) return ret; } -static BOOL osmesa_wglSetPixelFormat( HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr ) -{ - if (fmt <= 0 || fmt > ARRAY_SIZE( pixel_formats )) return FALSE; - return NtGdiSetPixelFormat( hdc, fmt ); -} - static BOOL osmesa_wglShareLists( struct wgl_context *org, struct wgl_context *dest ) { FIXME( "not supported yet\n" ); @@ -379,10 +361,8 @@ static struct opengl_funcs osmesa_opengl_funcs = .p_wglCopyContext = osmesa_wglCopyContext, .p_wglCreateContext = osmesa_wglCreateContext, .p_wglDeleteContext = osmesa_wglDeleteContext, - .p_wglGetPixelFormat = osmesa_wglGetPixelFormat, .p_wglGetProcAddress = osmesa_wglGetProcAddress, .p_wglMakeCurrent = osmesa_wglMakeCurrent, - .p_wglSetPixelFormat = osmesa_wglSetPixelFormat, .p_wglShareLists = osmesa_wglShareLists, .p_wglSwapBuffers = osmesa_wglSwapBuffers, .p_get_pixel_formats = osmesa_get_pixel_formats, @@ -425,9 +405,83 @@ static const char *win32u_wglGetExtensionsStringEXT(void) static struct opengl_funcs *display_funcs; static struct opengl_funcs *memory_funcs; +static int win32u_wglGetPixelFormat( HDC hdc ) +{ + int ret = 0; + HWND hwnd; + DC *dc; + + if ((hwnd = NtUserWindowFromDC( hdc ))) + ret = win32u_get_window_pixel_format( hwnd ); + else if ((dc = get_dc_ptr( hdc ))) + { + BOOL is_display = dc->is_display; + UINT total, onscreen; + ret = dc->pixel_format; + release_dc_ptr( dc ); + + if (is_display && ret >= 0) + { + /* Offscreen formats can't be used with traditional WGL calls. As has been + * verified on Windows GetPixelFormat doesn't fail but returns 1. + */ + display_funcs->p_get_pixel_formats( NULL, 0, &total, &onscreen ); + if (ret > onscreen) ret = 1; + } + } + + TRACE( "%p/%p -> %d\n", hdc, hwnd, ret ); + return ret; +} + +static BOOL set_dc_pixel_format( HDC hdc, int new_format, BOOL internal ) +{ + struct opengl_funcs *funcs; + UINT total, onscreen; + HWND hwnd; + + if (!(funcs = get_dc_funcs( hdc, NULL ))) return FALSE; + funcs->p_get_pixel_formats( NULL, 0, &total, &onscreen ); + if (new_format <= 0 || new_format > total) return FALSE; + + if ((hwnd = NtUserWindowFromDC( hdc ))) + { + int old_format; + + if (new_format > onscreen) + { + WARN( "Invalid format %d for %p/%p\n", new_format, hdc, hwnd ); + return FALSE; + } + + TRACE( "%p/%p format %d, internal %u\n", hdc, hwnd, new_format, internal ); + + if ((old_format = win32u_get_window_pixel_format( hwnd )) && !internal) return old_format == new_format; + if (!driver_funcs->p_set_pixel_format( hwnd, old_format, new_format, internal )) return FALSE; + return win32u_set_window_pixel_format( hwnd, new_format, internal ); + } + + TRACE( "%p/%p format %d, internal %u\n", hdc, hwnd, new_format, internal ); + return NtGdiSetPixelFormat( hdc, new_format ); +} + +static BOOL win32u_wglSetPixelFormat( HDC hdc, int format, const PIXELFORMATDESCRIPTOR *pfd ) +{ + return set_dc_pixel_format( hdc, format, FALSE ); +} + +static BOOL win32u_wglSetPixelFormatWINE( HDC hdc, int format ) +{ + return set_dc_pixel_format( hdc, format, TRUE ); +} + static void memory_funcs_init(void) { memory_funcs = osmesa_get_wgl_driver(); + if (!memory_funcs) return; + + memory_funcs->p_wglGetPixelFormat = win32u_wglGetPixelFormat; + memory_funcs->p_wglSetPixelFormat = win32u_wglSetPixelFormat; } static void display_funcs_init(void) @@ -449,6 +503,18 @@ static void display_funcs_init(void) register_extension( wgl_extensions, ARRAY_SIZE(wgl_extensions), "WGL_EXT_extensions_string" ); display_funcs->p_wglGetExtensionsStringEXT = win32u_wglGetExtensionsStringEXT; + + if (driver_funcs->p_set_pixel_format) + { + display_funcs->p_wglGetPixelFormat = win32u_wglGetPixelFormat; + display_funcs->p_wglSetPixelFormat = win32u_wglSetPixelFormat; + + /* In WineD3D we need the ability to set the pixel format more than once (e.g. after a device reset). + * The default wglSetPixelFormat doesn't allow this, so add our own which allows it. + */ + register_extension( wgl_extensions, ARRAY_SIZE(wgl_extensions), "WGL_WINE_pixel_format_passthrough" ); + display_funcs->p_wglSetPixelFormatWINE = win32u_wglSetPixelFormatWINE; + } } static struct opengl_funcs *get_dc_funcs( HDC hdc, void *null_funcs ) diff --git a/include/wine/opengl_driver.h b/include/wine/opengl_driver.h index d8b2336aadd..c18edb5476b 100644 --- a/include/wine/opengl_driver.h +++ b/include/wine/opengl_driver.h @@ -114,6 +114,7 @@ struct opengl_funcs struct opengl_driver_funcs { const char *(*p_init_wgl_extensions)(void); + BOOL (*p_set_pixel_format)(HWND,int,int,BOOL); }; #endif /* WINE_UNIX_LIB */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7721
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/wineandroid.drv/opengl.c | 90 +++-------------------------------- 1 file changed, 7 insertions(+), 83 deletions(-) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 311fea95f8b..c6c42a3bf2b 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -110,11 +110,6 @@ static void (*pglFlush)(void); pthread_mutex_t drawable_mutex; -static inline BOOL is_onscreen_pixel_format( int format ) -{ - return format > 0 && format <= nb_onscreen_formats; -} - static struct gl_drawable *create_gl_drawable( HWND hwnd, HDC hdc, int format ) { static const int attribs[] = { EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE }; @@ -207,49 +202,26 @@ void update_gl_drawable( HWND hwnd ) } } -static BOOL set_pixel_format( HDC hdc, int format, BOOL internal ) +static BOOL android_set_pixel_format( HWND hwnd, int old_format, int new_format, BOOL internal ) { struct gl_drawable *gl; - HWND hwnd = NtUserWindowFromDC( hdc ); - if (!hwnd || hwnd == NtUserGetDesktopWindow()) - { - WARN( "not a proper window DC %p/%p\n", hdc, hwnd ); - return FALSE; - } - if (!is_onscreen_pixel_format( format )) - { - WARN( "Invalid format %d\n", format ); - return FALSE; - } - TRACE( "%p/%p format %d\n", hdc, hwnd, format ); - - if (!internal) - { - /* cannot change it if already set */ - int prev = win32u_get_window_pixel_format( hwnd ); - - if (prev) - return prev == format; - } + TRACE( "hwnd %p, old_format %d, new_format %d, internal %u\n", hwnd, old_format, new_format, internal ); if ((gl = get_gl_drawable( hwnd, 0 ))) { if (internal) { EGLint pf; - p_eglGetConfigAttrib( display, pixel_formats[format - 1].config, EGL_NATIVE_VISUAL_ID, &pf ); + p_eglGetConfigAttrib( display, pixel_formats[new_format - 1].config, EGL_NATIVE_VISUAL_ID, &pf ); gl->window->perform( gl->window, NATIVE_WINDOW_SET_BUFFERS_FORMAT, pf ); - gl->format = format; + gl->format = new_format; } } - else gl = create_gl_drawable( hwnd, 0, format ); - + else gl = create_gl_drawable( hwnd, 0, new_format ); release_gl_drawable( gl ); - if (win32u_set_window_pixel_format( hwnd, format, internal )) return TRUE; - destroy_gl_drawable( hwnd ); - return FALSE; + return TRUE; } static struct wgl_context *create_context( HDC hdc, struct wgl_context *share, const int *attribs ) @@ -424,14 +396,6 @@ static int android_wglGetSwapIntervalEXT(void) return swap_interval; } -/*********************************************************************** - * android_wglSetPixelFormatWINE - */ -static BOOL android_wglSetPixelFormatWINE( HDC hdc, int format ) -{ - return set_pixel_format( hdc, format, TRUE ); -} - /*********************************************************************** * android_wglCopyContext */ @@ -464,30 +428,6 @@ static BOOL android_wglDeleteContext( struct wgl_context *ctx ) return TRUE; } -/*********************************************************************** - * android_wglGetPixelFormat - */ -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 ); - - /* 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 */ - if (!is_onscreen_pixel_format( ret )) ret = 1; - release_gl_drawable( gl ); - } - return ret; -} - /*********************************************************************** * android_wglGetProcAddress */ @@ -540,14 +480,6 @@ done: return ret; } -/*********************************************************************** - * android_wglSetPixelFormat - */ -static BOOL android_wglSetPixelFormat( HDC hdc, int format, const PIXELFORMATDESCRIPTOR *pfd ) -{ - return set_pixel_format( hdc, format, FALSE ); -} - /*********************************************************************** * android_wglShareLists */ @@ -633,13 +565,6 @@ static const char *android_init_wgl_extensions(void) egl_funcs.p_wglGetSwapIntervalEXT = android_wglGetSwapIntervalEXT; register_extension("WGL_EXT_framebuffer_sRGB"); - - /* In WineD3D we need the ability to set the pixel format more than once (e.g. after a device reset). - * The default wglSetPixelFormat doesn't allow this, so add our own which allows it. - */ - register_extension("WGL_WINE_pixel_format_passthrough"); - egl_funcs.p_wglSetPixelFormatWINE = android_wglSetPixelFormatWINE; - return wgl_extensions; } @@ -941,6 +866,7 @@ static void init_opengl_funcs(void) static const struct opengl_driver_funcs android_driver_funcs = { .p_init_wgl_extensions = android_init_wgl_extensions, + .p_set_pixel_format = android_set_pixel_format, }; /********************************************************************** @@ -1055,10 +981,8 @@ static struct opengl_funcs egl_funcs = .p_wglCopyContext = android_wglCopyContext, .p_wglCreateContext = android_wglCreateContext, .p_wglDeleteContext = android_wglDeleteContext, - .p_wglGetPixelFormat = android_wglGetPixelFormat, .p_wglGetProcAddress = android_wglGetProcAddress, .p_wglMakeCurrent = android_wglMakeCurrent, - .p_wglSetPixelFormat = android_wglSetPixelFormat, .p_wglShareLists = android_wglShareLists, .p_wglSwapBuffers = android_wglSwapBuffers, .p_get_pixel_formats = android_get_pixel_formats, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7721
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winewayland.drv/opengl.c | 43 ++++++----------------------------- 1 file changed, 7 insertions(+), 36 deletions(-) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 9a973b983dc..d9af9a7247d 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -110,7 +110,7 @@ struct wgl_pbuffer { struct list entry; struct wayland_gl_drawable *gl; - int width, height; + int width, height, pixel_format; int texture_format, texture_target, texture_binding; EGLContext tmp_context, prev_context; }; @@ -432,35 +432,18 @@ static void wgl_context_refresh(struct wgl_context *ctx) if (old_read) wayland_gl_drawable_release(old_read); } -static BOOL set_pixel_format(HDC hdc, int format, BOOL internal) +static BOOL wayland_set_pixel_format(HWND hwnd, int old_format, int new_format, BOOL internal) { - HWND hwnd = NtUserWindowFromDC(hdc); struct wayland_gl_drawable *gl; - int prev = 0; - - if (!hwnd || hwnd == NtUserGetDesktopWindow()) - { - WARN("not a proper window DC %p/%p\n", hdc, hwnd); - return FALSE; - } - if (!is_onscreen_format(format)) - { - WARN("Invalid format %d\n", format); - return FALSE; - } - TRACE("%p/%p format %d\n", hdc, hwnd, format); /* Even for internal pixel format fail setting it if the app has already set a * different pixel format. Let wined3d create a backup GL context instead. * Switching pixel format involves drawable recreation and is much more expensive * than blitting from backup context. */ - if ((prev = win32u_get_window_pixel_format(hwnd))) - return prev == format; + if (old_format) return old_format == new_format; - if (!(gl = wayland_gl_drawable_create(hwnd, format))) return FALSE; + if (!(gl = wayland_gl_drawable_create(hwnd, new_format))) return FALSE; wayland_update_gl_drawable(hwnd, gl); - win32u_set_window_pixel_format(hwnd, format, internal); - return TRUE; } @@ -640,17 +623,6 @@ static BOOL wayland_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) return wayland_wglMakeContextCurrentARB(hdc, hdc, ctx); } -static BOOL wayland_wglSetPixelFormat(HDC hdc, int format, - const PIXELFORMATDESCRIPTOR *pfd) -{ - return set_pixel_format(hdc, format, FALSE); -} - -static BOOL wayland_wglSetPixelFormatWINE(HDC hdc, int format) -{ - return set_pixel_format(hdc, format, TRUE); -} - static BOOL wayland_wglShareLists(struct wgl_context *orig, struct wgl_context *dest) { struct wgl_context *keep, *clobber; @@ -771,6 +743,7 @@ static struct wgl_pbuffer *wayland_wglCreatePbufferARB(HDC hdc, int format, pbuffer->width = width; pbuffer->height = height; + pbuffer->pixel_format = format; wl_egl_window_resize(pbuffer->gl->wl_egl_window, width, height, 0, 0); for (; attribs && attribs[0]; attribs += 2) @@ -894,6 +867,7 @@ static HDC wayland_wglGetPbufferDCARB(struct wgl_pbuffer *pbuffer) return 0; } + NtGdiSetPixelFormat(hdc, pbuffer->pixel_format); return hdc; } @@ -1203,9 +1177,6 @@ static BOOL init_opengl_funcs(void) static const char *wayland_init_wgl_extensions(void) { - register_extension("WGL_WINE_pixel_format_passthrough"); - opengl_funcs.p_wglSetPixelFormatWINE = wayland_wglSetPixelFormatWINE; - register_extension("WGL_ARB_make_current_read"); opengl_funcs.p_wglGetCurrentReadDCARB = (void *)1; /* never called */ opengl_funcs.p_wglMakeContextCurrentARB = wayland_wglMakeContextCurrentARB; @@ -1302,6 +1273,7 @@ static BOOL init_egl_configs(void) static const struct opengl_driver_funcs wayland_driver_funcs = { .p_init_wgl_extensions = wayland_init_wgl_extensions, + .p_set_pixel_format = wayland_set_pixel_format, }; /********************************************************************** @@ -1415,7 +1387,6 @@ static struct opengl_funcs opengl_funcs = .p_wglDeleteContext = wayland_wglDeleteContext, .p_wglGetProcAddress = wayland_wglGetProcAddress, .p_wglMakeCurrent = wayland_wglMakeCurrent, - .p_wglSetPixelFormat = wayland_wglSetPixelFormat, .p_wglShareLists = wayland_wglShareLists, .p_wglSwapBuffers = wayland_wglSwapBuffers, .p_get_pixel_formats = wayland_get_pixel_formats, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7721
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 123 +++++++------------------------------- 1 file changed, 20 insertions(+), 103 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 717df3c2501..c0d44d8ef7a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -242,6 +242,7 @@ struct wgl_pbuffer const struct glx_pixel_format* fmt; int width; int height; + int pixel_format; int* attribList; int use_render_texture; /* This is also the internal texture format */ int texture_bind_target; @@ -1199,26 +1200,33 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct glx_pixel return gl; } - -/*********************************************************************** - * set_win_format - */ -static BOOL set_win_format( HWND hwnd, const struct glx_pixel_format *format, BOOL internal ) +static BOOL x11drv_set_pixel_format( HWND hwnd, int old_format, int new_format, BOOL internal ) { + const struct glx_pixel_format *fmt; struct gl_drawable *old, *gl; - if (!format->visual) return FALSE; + /* Even for internal pixel format fail setting it if the app has already set a + * different pixel format. Let wined3d create a backup GL context instead. + * Switching pixel format involves drawable recreation and is much more expensive + * than blitting from backup context. */ + if (old_format) return old_format == new_format; - if (!(old = get_gl_drawable( hwnd, 0 )) || old->format != format) + if (!(fmt = get_pixel_format(gdi_display, new_format, FALSE /* Offscreen */))) { - if (!(gl = create_gl_drawable( hwnd, format, FALSE, internal ))) + ERR( "Invalid format %d\n", new_format ); + return FALSE; + } + + if (!(old = get_gl_drawable( hwnd, 0 )) || old->format != fmt) + { + if (!(gl = create_gl_drawable( hwnd, fmt, FALSE, internal ))) { release_gl_drawable( old ); return FALSE; } TRACE( "created GL drawable %lx for win %p %s\n", - gl->drawable, hwnd, debugstr_fbconfig( format->fbconfig )); + gl->drawable, hwnd, debugstr_fbconfig( fmt->fbconfig )); if (old) mark_drawable_dirty( old, gl ); @@ -1228,51 +1236,9 @@ static BOOL set_win_format( HWND hwnd, const struct glx_pixel_format *format, BO } release_gl_drawable( old ); - - win32u_set_window_pixel_format( hwnd, pixel_format_index( format ), internal ); return TRUE; } - -static BOOL set_pixel_format( HDC hdc, int format, BOOL internal ) -{ - const struct glx_pixel_format *fmt; - int value; - HWND hwnd = NtUserWindowFromDC( hdc ); - int prev; - - TRACE("(%p,%d)\n", hdc, format); - - if (!hwnd || hwnd == NtUserGetDesktopWindow()) - { - WARN( "not a valid window DC %p/%p\n", hdc, hwnd ); - return FALSE; - } - - fmt = get_pixel_format(gdi_display, format, FALSE /* Offscreen */); - if (!fmt) - { - ERR( "Invalid format %d\n", format ); - return FALSE; - } - - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - if (!(value & GLX_WINDOW_BIT)) - { - WARN( "Pixel format %d is not compatible for window rendering\n", format ); - return FALSE; - } - - /* Even for internal pixel format fail setting it if the app has already set a - * different pixel format. Let wined3d create a backup GL context instead. - * Switching pixel format involves drawable recreation and is much more expensive - * than blitting from backup context. */ - if ((prev = win32u_get_window_pixel_format( hwnd ))) - return prev == format; - - return set_win_format( hwnd, fmt, internal ); -} - static void update_gl_drawable_size( struct gl_drawable *gl ) { struct gl_drawable *new_gl; @@ -1595,39 +1561,6 @@ static int describe_pixel_format( int iPixelFormat, struct wgl_pixel_format *pf return nb_onscreen_formats; } - -/*********************************************************************** - * glxdrv_wglGetPixelFormat - */ -static int glxdrv_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( NULL, hdc ))) - { - ret = pixel_format_index( gl->format ); - /* Offscreen formats can't be used with traditional WGL calls. - * As has been verified on Windows GetPixelFormat doesn't fail but returns iPixelFormat=1. */ - if (!is_onscreen_pixel_format( ret )) ret = 1; - release_gl_drawable( gl ); - } - TRACE( "%p -> %d\n", hdc, ret ); - return ret; -} - -/*********************************************************************** - * glxdrv_wglSetPixelFormat - */ -static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd ) -{ - return set_pixel_format(hdc, iPixelFormat, FALSE); -} - /*********************************************************************** * glxdrv_wglCopyContext */ @@ -2088,6 +2021,7 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat } object->width = iWidth; object->height = iHeight; + object->pixel_format = iPixelFormat; object->fmt = fmt; PUSH2(attribs, GLX_PBUFFER_WIDTH, iWidth); @@ -2301,6 +2235,7 @@ static HDC X11DRV_wglGetPbufferDCARB( struct wgl_pbuffer *object ) escape.visual = default_visual; NtGdiExtEscape( hdc, NULL, 0, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); + NtGdiSetPixelFormat( hdc, object->pixel_format ); TRACE( "(%p)->(%p)\n", object, hdc ); return hdc; } @@ -2591,17 +2526,6 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) return ret; } -/** - * X11DRV_wglSetPixelFormatWINE - * - * WGL_WINE_pixel_format_passthrough: wglSetPixelFormatWINE - * This is a WINE-specific wglSetPixelFormat which can set the pixel format multiple times. - */ -static BOOL X11DRV_wglSetPixelFormatWINE(HDC hdc, int format) -{ - return set_pixel_format(hdc, format, TRUE); -} - static BOOL X11DRV_wglQueryCurrentRendererIntegerWINE( GLenum attribute, GLuint *value ) { return pglXQueryCurrentRendererIntegerMESA( attribute, value ); @@ -2752,12 +2676,6 @@ static const char *x11drv_init_wgl_extensions(void) /* WINE-specific WGL Extensions */ - /* In WineD3D we need the ability to set the pixel format more than once (e.g. after a device reset). - * The default wglSetPixelFormat doesn't allow this, so add our own which allows it. - */ - register_extension( "WGL_WINE_pixel_format_passthrough" ); - opengl_funcs.p_wglSetPixelFormatWINE = X11DRV_wglSetPixelFormatWINE; - if (has_extension( glxExtensions, "GLX_MESA_query_renderer" )) { register_extension( "WGL_WINE_query_renderer" ); @@ -2864,6 +2782,7 @@ static void glxdrv_get_pixel_formats( struct wgl_pixel_format *formats, static const struct opengl_driver_funcs x11drv_driver_funcs = { .p_init_wgl_extensions = x11drv_init_wgl_extensions, + .p_set_pixel_format = x11drv_set_pixel_format, }; static struct opengl_funcs opengl_funcs = @@ -2871,10 +2790,8 @@ static struct opengl_funcs opengl_funcs = .p_wglCopyContext = glxdrv_wglCopyContext, .p_wglCreateContext = glxdrv_wglCreateContext, .p_wglDeleteContext = glxdrv_wglDeleteContext, - .p_wglGetPixelFormat = glxdrv_wglGetPixelFormat, .p_wglGetProcAddress = glxdrv_wglGetProcAddress, .p_wglMakeCurrent = glxdrv_wglMakeCurrent, - .p_wglSetPixelFormat = glxdrv_wglSetPixelFormat, .p_wglShareLists = glxdrv_wglShareLists, .p_wglSwapBuffers = glxdrv_wglSwapBuffers, .p_get_pixel_formats = glxdrv_get_pixel_formats, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7721
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winemac.drv/opengl.c | 161 ++------------------------------------ 1 file changed, 7 insertions(+), 154 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 114d5a8d43f..d97e01578b7 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1324,43 +1324,6 @@ static BOOL init_gl_info(void) } -static int get_dc_pixel_format(HWND hwnd, HDC hdc) -{ - int format; - - if (hwnd) - { - struct macdrv_win_data *data; - - if (!(data = get_win_data(hwnd))) - { - FIXME("DC for window %p of other process: not implemented\n", hwnd); - return 0; - } - - format = data->pixel_format; - release_win_data(data); - } - else - { - struct wgl_pbuffer *pbuffer; - - pthread_mutex_lock(&dc_pbuffers_mutex); - pbuffer = (struct wgl_pbuffer*)CFDictionaryGetValue(dc_pbuffers, hdc); - if (pbuffer) - format = pbuffer->format; - else - { - WARN("no window or pbuffer for DC %p\n", hdc); - format = 0; - } - pthread_mutex_unlock(&dc_pbuffers_mutex); - } - - return format; -} - - /********************************************************************** * create_context */ @@ -1510,35 +1473,11 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns return TRUE; } - -/********************************************************************** - * set_pixel_format - * - * Implementation of wglSetPixelFormat and wglSetPixelFormatWINE. - */ -static BOOL set_pixel_format(HDC hdc, int fmt, BOOL internal) +static BOOL macdrv_set_pixel_format(HWND hwnd, int old_format, int new_format, BOOL internal) { struct macdrv_win_data *data; - const pixel_format *pf; - HWND hwnd = NtUserWindowFromDC(hdc); - BOOL ret = FALSE; - - TRACE("hdc %p format %d\n", hdc, fmt); - - if (!hwnd || hwnd == NtUserGetDesktopWindow()) - { - WARN("not a proper window DC %p/%p\n", hdc, hwnd); - return FALSE; - } - - if (!internal) - { - /* cannot change it if already set */ - int prev = win32u_get_window_pixel_format( hwnd ); - if (prev) - return prev == fmt; - } + TRACE("hwnd %p, old_format %d, new_format %d, internal %u\n", hwnd, old_format, new_format, internal); if (!(data = get_win_data(hwnd))) { @@ -1546,44 +1485,9 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL internal) return FALSE; } - /* Check if fmt is in our list of supported formats to see if it is supported. */ - pf = get_pixel_format(fmt, FALSE /* non-displayable */); - if (!pf) - { - ERR("Invalid pixel format: %d\n", fmt); - goto done; - } - - if (!pf->window) - { - WARN("Pixel format %d is not compatible for window rendering\n", fmt); - goto done; - } - - data->pixel_format = fmt; - - TRACE("pixel format:\n"); - TRACE(" window: %u\n", (unsigned int)pf->window); - TRACE(" pBuffer: %u\n", (unsigned int)pf->pbuffer); - TRACE(" accelerated: %u\n", (unsigned int)pf->accelerated); - TRACE(" color bits: %u%s\n", (unsigned int)color_modes[pf->color_mode].color_bits, (color_modes[pf->color_mode].is_float ? " float" : "")); - TRACE(" alpha bits: %u\n", (unsigned int)color_modes[pf->color_mode].alpha_bits); - TRACE(" aux buffers: %u\n", (unsigned int)pf->aux_buffers); - TRACE(" depth bits: %u\n", (unsigned int)pf->depth_bits); - TRACE(" stencil bits: %u\n", (unsigned int)pf->stencil_bits); - TRACE(" accum bits: %u\n", (unsigned int)pf->accum_mode ? color_modes[pf->accum_mode - 1].color_bits : 0); - TRACE(" double_buffer: %u\n", (unsigned int)pf->double_buffer); - TRACE(" stereo: %u\n", (unsigned int)pf->stereo); - TRACE(" sample_buffers: %u\n", (unsigned int)pf->sample_buffers); - TRACE(" samples: %u\n", (unsigned int)pf->samples); - TRACE(" backing_store: %u\n", (unsigned int)pf->backing_store); - ret = TRUE; - -done: + data->pixel_format = new_format; release_win_data(data); - if (ret && gl_surface_mode == GL_SURFACE_BEHIND) - win32u_set_window_pixel_format(hwnd, fmt, internal); - return ret; + return TRUE; } @@ -2391,7 +2295,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(NtUserWindowFromDC(hdc), hdc); + format = opengl_funcs.p_wglGetPixelFormat(hdc); if (!is_valid_pixel_format(format)) { @@ -2734,6 +2638,7 @@ static HDC macdrv_wglGetPbufferDCARB(struct wgl_pbuffer *pbuffer) CFDictionarySetValue(dc_pbuffers, hdc, pbuffer); pthread_mutex_unlock(&dc_pbuffers_mutex); + NtGdiSetPixelFormat(hdc, pbuffer->format); TRACE("pbuffer %p -> hdc %p\n", pbuffer, hdc); return hdc; } @@ -3350,17 +3255,6 @@ static BOOL macdrv_wglSetPbufferAttribARB(struct wgl_pbuffer *pbuffer, const int } -/********************************************************************** - * macdrv_wglSetPixelFormatWINE - * - * WGL_WINE_pixel_format_passthrough: wglSetPixelFormatWINE - */ -static BOOL macdrv_wglSetPixelFormatWINE(HDC hdc, int fmt) -{ - return set_pixel_format(hdc, fmt, TRUE); -} - - /********************************************************************** * macdrv_wglSwapIntervalEXT * @@ -3502,12 +3396,6 @@ static const char *macdrv_init_wgl_extensions(void) * WINE-specific WGL Extensions */ - /* In WineD3D we need the ability to set the pixel format more than once (e.g. after a device reset). - * The default wglSetPixelFormat doesn't allow this, so add our own which allows it. - */ - register_extension("WGL_WINE_pixel_format_passthrough"); - opengl_funcs.p_wglSetPixelFormatWINE = macdrv_wglSetPixelFormatWINE; - register_extension("WGL_WINE_query_renderer"); opengl_funcs.p_wglQueryCurrentRendererIntegerWINE = macdrv_wglQueryCurrentRendererIntegerWINE; opengl_funcs.p_wglQueryCurrentRendererStringWINE = macdrv_wglQueryCurrentRendererStringWINE; @@ -3746,32 +3634,6 @@ static BOOL macdrv_wglDeleteContext(struct wgl_context *context) return TRUE; } -/*********************************************************************** - * macdrv_wglGetPixelFormat - */ -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(NULL, hdc); - - if (!is_valid_pixel_format(format)) /* not set yet */ - format = 0; - else if (!is_displayable_pixel_format(format)) - { - /* Non-displayable formats can't be used with traditional WGL calls. - * As has been verified on Windows GetPixelFormat doesn't fail but returns pixel format 1. */ - format = 1; - } - - TRACE(" hdc %p -> %d\n", hdc, format); - return format; -} - /*********************************************************************** * macdrv_wglGetProcAddress */ @@ -3808,14 +3670,6 @@ static BOOL macdrv_wglMakeCurrent(HDC hdc, struct wgl_context *context) return macdrv_wglMakeContextCurrentARB(hdc, hdc, context); } -/********************************************************************** - * macdrv_wglSetPixelFormat - */ -static BOOL macdrv_wglSetPixelFormat(HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr) -{ - return set_pixel_format(hdc, fmt, FALSE); -} - /*********************************************************************** * macdrv_wglShareLists */ @@ -3957,6 +3811,7 @@ static void macdrv_get_pixel_formats(struct wgl_pixel_format *formats, static const struct opengl_driver_funcs macdrv_driver_funcs = { .p_init_wgl_extensions = macdrv_init_wgl_extensions, + .p_set_pixel_format = macdrv_set_pixel_format, }; static struct opengl_funcs opengl_funcs = @@ -3964,10 +3819,8 @@ static struct opengl_funcs opengl_funcs = .p_wglCopyContext = macdrv_wglCopyContext, .p_wglCreateContext = macdrv_wglCreateContext, .p_wglDeleteContext = macdrv_wglDeleteContext, - .p_wglGetPixelFormat = macdrv_wglGetPixelFormat, .p_wglGetProcAddress = macdrv_wglGetProcAddress, .p_wglMakeCurrent = macdrv_wglMakeCurrent, - .p_wglSetPixelFormat = macdrv_wglSetPixelFormat, .p_wglShareLists = macdrv_wglShareLists, .p_wglSwapBuffers = macdrv_wglSwapBuffers, .p_get_pixel_formats = macdrv_get_pixel_formats, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7721
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/opengl.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c index 693ec8b9517..8eedc5c2344 100644 --- a/dlls/win32u/opengl.c +++ b/dlls/win32u/opengl.c @@ -382,9 +382,15 @@ static const char *nulldrv_init_wgl_extensions(void) return ""; } +static BOOL nulldrv_set_pixel_format( HWND hwnd, int old_format, int new_format, BOOL internal ) +{ + return TRUE; +} + static const struct opengl_driver_funcs nulldrv_funcs = { .p_init_wgl_extensions = nulldrv_init_wgl_extensions, + .p_set_pixel_format = nulldrv_set_pixel_format, }; static const struct opengl_driver_funcs *driver_funcs = &nulldrv_funcs; @@ -497,6 +503,8 @@ static void display_funcs_init(void) if (!display_funcs) return; strcpy( wgl_extensions, driver_funcs->p_init_wgl_extensions() ); + display_funcs->p_wglGetPixelFormat = win32u_wglGetPixelFormat; + display_funcs->p_wglSetPixelFormat = win32u_wglSetPixelFormat; register_extension( wgl_extensions, ARRAY_SIZE(wgl_extensions), "WGL_ARB_extensions_string" ); display_funcs->p_wglGetExtensionsStringARB = win32u_wglGetExtensionsStringARB; @@ -504,17 +512,11 @@ static void display_funcs_init(void) register_extension( wgl_extensions, ARRAY_SIZE(wgl_extensions), "WGL_EXT_extensions_string" ); display_funcs->p_wglGetExtensionsStringEXT = win32u_wglGetExtensionsStringEXT; - if (driver_funcs->p_set_pixel_format) - { - display_funcs->p_wglGetPixelFormat = win32u_wglGetPixelFormat; - display_funcs->p_wglSetPixelFormat = win32u_wglSetPixelFormat; - - /* In WineD3D we need the ability to set the pixel format more than once (e.g. after a device reset). - * The default wglSetPixelFormat doesn't allow this, so add our own which allows it. - */ - register_extension( wgl_extensions, ARRAY_SIZE(wgl_extensions), "WGL_WINE_pixel_format_passthrough" ); - display_funcs->p_wglSetPixelFormatWINE = win32u_wglSetPixelFormatWINE; - } + /* In WineD3D we need the ability to set the pixel format more than once (e.g. after a device reset). + * The default wglSetPixelFormat doesn't allow this, so add our own which allows it. + */ + register_extension( wgl_extensions, ARRAY_SIZE(wgl_extensions), "WGL_WINE_pixel_format_passthrough" ); + display_funcs->p_wglSetPixelFormatWINE = win32u_wglSetPixelFormatWINE; } static struct opengl_funcs *get_dc_funcs( HDC hdc, void *null_funcs ) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7721
participants (1)
-
Rémi Bernon