[PATCH v2 0/4] MR9541: win32u: Reduce EGL memory usage by skipping some devices initialization.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58833 -- v2: win32u: Skip non-display software EGL devices initialization. win32u: Terminate non-display EGL devices after initialization. win32u: Add the display device first in the EGL device list. win32u: Keep devices EGL platforms in a list. https://gitlab.winehq.org/wine/wine/-/merge_requests/9541
From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58833 --- dlls/win32u/opengl.c | 93 ++++++++++++++++++++++++------------ include/wine/opengl_driver.h | 2 + 2 files changed, 64 insertions(+), 31 deletions(-) diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c index c4aed62a3ae..2dd4f40f712 100644 --- a/dlls/win32u/opengl.c +++ b/dlls/win32u/opengl.c @@ -54,11 +54,12 @@ struct wgl_pbuffer static const struct opengl_driver_funcs nulldrv_funcs, *driver_funcs = &nulldrv_funcs; static const struct opengl_funcs *default_funcs; /* default GL function table from opengl32 */ -static struct egl_platform display_egl, *devices_egl; +static struct list devices_egl = LIST_INIT( devices_egl ); +static struct egl_platform display_egl; static struct opengl_funcs display_funcs; static struct wgl_pixel_format *pixel_formats; -static UINT formats_count, onscreen_count, devices_count; +static UINT formats_count, onscreen_count; static char wgl_extensions[4096]; static BOOL has_extension( const char *list, const char *ext ) @@ -962,7 +963,7 @@ static void init_egl_devices( struct opengl_funcs *funcs ) EGLDeviceEXT *devices = NULL; struct egl_platform *egl; const char *extensions; - EGLint i, count; + EGLint count; if (!(extensions = funcs->p_eglQueryString( EGL_NO_DISPLAY, EGL_EXTENSIONS ))) return; if (!has_extension( extensions, "EGL_EXT_device_base" ) || !has_extension( extensions, "EGL_EXT_platform_device" )) return; @@ -982,21 +983,25 @@ static void init_egl_devices( struct opengl_funcs *funcs ) TRACE( "Found display platform device %p\n", display_egl.device ); funcs->p_eglQueryDevicesEXT( 0, NULL, &count ); - if (!count || !(devices = calloc( count, sizeof(EGLDeviceEXT *) )) || !(devices_egl = calloc( count, sizeof(*devices_egl) ))) goto done; + if (!count || !(devices = calloc( count, sizeof(EGLDeviceEXT *) ))) goto done; funcs->p_eglQueryDevicesEXT( count, devices, &count ); - for (i = 0, egl = devices_egl; i < count; i++) + for (int i = 0; i < count; i++) { + if (!(egl = calloc( 1, sizeof(*egl) ))) break; + TRACE( "Initializing EGL device %p\n", devices[i] ); egl->type = EGL_PLATFORM_DEVICE_EXT; egl->native_display = devices[i]; egl->device = devices[i]; - if (init_egl_platform( egl, funcs )) egl++; + egl->index = list_count( &devices_egl ); + + if (!init_egl_platform( egl, funcs )) free( egl ); + else list_add_tail( &devices_egl, &egl->entry ); } - devices_count = egl - devices_egl; done: - TRACE( "Initialized %u EGL devices\n", devices_count ); + TRACE( "Initialized %u EGL devices\n", list_count( &devices_egl ) ); free( devices ); } @@ -1063,7 +1068,7 @@ static void init_device_info( struct egl_platform *egl, const struct opengl_func const char *extensions, *str; EGLConfig config; - TRACE( "Initializing device %zu (%p)\n", egl - devices_egl, egl->device); + TRACE( "Initializing device %u (%p)\n", egl->index, egl->device); extensions = funcs->p_eglQueryDeviceStringEXT( egl->device, EGL_EXTENSIONS ); /* Assume that all devices without EGL_MESA_device_software are accelerated. */ @@ -2321,14 +2326,19 @@ static int win32u_wglGetSwapIntervalEXT(void) return interval; } -static BOOL win32u_wglQueryRendererIntegerWINE( HDC hdc, GLint renderer, GLenum attribute, GLuint *value ) +static struct egl_platform *egl_platform_from_index( GLint index ) { - struct egl_platform *egl = devices_egl + renderer; + struct egl_platform *egl; - TRACE( "hdc %p, renderer %u, attribute %#x, value %p\n", hdc, renderer, attribute, value ); + LIST_FOR_EACH_ENTRY( egl, &devices_egl, struct egl_platform, entry ) + if (egl->index == index) return egl; - if (renderer >= devices_count) return FALSE; + WARN( "Cannot find renderer at index %d\n", index ); + return NULL; +} +static BOOL query_renderer_integer( struct egl_platform *egl, GLenum attribute, GLuint *value ) +{ switch (attribute) { case WGL_RENDERER_ACCELERATED_WINE: *value = egl->accelerated; return TRUE; @@ -2354,14 +2364,18 @@ static BOOL win32u_wglQueryRendererIntegerWINE( HDC hdc, GLint renderer, GLenum return FALSE; } -static const char *win32u_wglQueryRendererStringWINE( HDC hdc, GLint renderer, GLenum attribute ) +static BOOL win32u_wglQueryRendererIntegerWINE( HDC hdc, GLint renderer, GLenum attribute, GLuint *value ) { - struct egl_platform *egl = devices_egl + renderer; + struct egl_platform *egl; - TRACE( "hdc %p, renderer %u, attribute %#x\n", hdc, renderer, attribute ); + TRACE( "hdc %p, renderer %u, attribute %#x, value %p\n", hdc, renderer, attribute, value ); - if (renderer >= devices_count) return NULL; + if (!(egl = egl_platform_from_index( renderer ))) return FALSE; + return query_renderer_integer( egl, attribute, value ); +} +static const char *query_renderer_string( struct egl_platform *egl, GLenum attribute ) +{ switch (attribute) { case WGL_RENDERER_DEVICE_ID_WINE: return egl->device_name; @@ -2372,34 +2386,50 @@ static const char *win32u_wglQueryRendererStringWINE( HDC hdc, GLint renderer, G return NULL; } +static const char *win32u_wglQueryRendererStringWINE( HDC hdc, GLint renderer, GLenum attribute ) +{ + struct egl_platform *egl; + + TRACE( "hdc %p, renderer %u, attribute %#x\n", hdc, renderer, attribute ); + + if (!(egl = egl_platform_from_index( renderer ))) return NULL; + return query_renderer_string( egl, attribute ); +} + +static struct egl_platform *egl_platform_from_device( EGLDeviceEXT device ) +{ + struct egl_platform *egl; + + LIST_FOR_EACH_ENTRY( egl, &devices_egl, struct egl_platform, entry ) + if (egl->device == device) return egl; + + WARN( "Cannot find current renderer\n" ); + return NULL; +} + static BOOL win32u_wglQueryCurrentRendererIntegerWINE( GLenum attribute, GLuint *value ) { - int i; + struct egl_platform *egl; TRACE( "attribute %#x, value %p\n", attribute, value ); - for (i = 0; i < devices_count; i++) if (devices_egl[i].device == display_egl.device) break; - if (i < devices_count) return win32u_wglQueryRendererIntegerWINE( 0, i, attribute, value ); - - WARN( "Cannot find current renderer device\n" ); - return FALSE; + if (!(egl = egl_platform_from_device( display_egl.device ))) return FALSE; + return query_renderer_integer( egl, attribute, value ); } static const char *win32u_wglQueryCurrentRendererStringWINE( GLenum attribute ) { - int i; + struct egl_platform *egl; TRACE( "attribute %#x\n", attribute ); - for (i = 0; i < devices_count; i++) if (devices_egl[i].device == display_egl.device) break; - if (i < devices_count) return win32u_wglQueryRendererStringWINE( 0, i, attribute ); - - WARN( "Cannot find current renderer device\n" ); - return NULL; + if (!(egl = egl_platform_from_device( display_egl.device ))) return NULL; + return query_renderer_string( egl, attribute ); } static void display_funcs_init(void) { + struct egl_platform *egl; UINT status; if (egl_init( &driver_funcs )) TRACE( "Initialized EGL library\n" ); @@ -2498,14 +2528,15 @@ static void display_funcs_init(void) display_funcs.p_wglSwapIntervalEXT = win32u_wglSwapIntervalEXT; display_funcs.p_wglGetSwapIntervalEXT = win32u_wglGetSwapIntervalEXT; - if (display_egl.device && devices_count) + if (display_egl.device && !list_empty( &devices_egl )) { register_extension( wgl_extensions, ARRAY_SIZE(wgl_extensions), "WGL_WINE_query_renderer" ); display_funcs.p_wglQueryCurrentRendererIntegerWINE = win32u_wglQueryCurrentRendererIntegerWINE; display_funcs.p_wglQueryCurrentRendererStringWINE = win32u_wglQueryCurrentRendererStringWINE; display_funcs.p_wglQueryRendererIntegerWINE = win32u_wglQueryRendererIntegerWINE; display_funcs.p_wglQueryRendererStringWINE = win32u_wglQueryRendererStringWINE; - for (int i = 0; i < devices_count; i++) init_device_info( devices_egl + i, &display_funcs ); + LIST_FOR_EACH_ENTRY( egl, &devices_egl, struct egl_platform, entry ) + init_device_info( egl, &display_funcs ); } } diff --git a/include/wine/opengl_driver.h b/include/wine/opengl_driver.h index e9052392471..d634f5469bc 100644 --- a/include/wine/opengl_driver.h +++ b/include/wine/opengl_driver.h @@ -131,11 +131,13 @@ struct opengl_funcs struct egl_platform { + struct list entry; EGLenum type; EGLNativeDisplayType native_display; BOOL force_pbuffer_formats; /* filled by win32u after init_egl_platform */ + unsigned int index; EGLDeviceEXT device; EGLDisplay display; UINT config_count; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9541
From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58833 --- dlls/win32u/opengl.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c index 2dd4f40f712..f420f9acd97 100644 --- a/dlls/win32u/opengl.c +++ b/dlls/win32u/opengl.c @@ -978,9 +978,10 @@ static void init_egl_devices( struct opengl_funcs *funcs ) if (!funcs->p_eglQueryDisplayAttribEXT( display_egl.display, EGL_DEVICE_EXT, (EGLAttrib *)&display_egl.device )) { WARN( "Failed to query EGL display device (error %#x).\n", funcs->p_eglGetError() ); - display_egl.device = EGL_NO_DEVICE_EXT; + return; } TRACE( "Found display platform device %p\n", display_egl.device ); + list_add_tail( &devices_egl, &display_egl.entry ); funcs->p_eglQueryDevicesEXT( 0, NULL, &count ); if (!count || !(devices = calloc( count, sizeof(EGLDeviceEXT *) ))) goto done; @@ -988,6 +989,7 @@ static void init_egl_devices( struct opengl_funcs *funcs ) for (int i = 0; i < count; i++) { + if (devices[i] == display_egl.device) continue; if (!(egl = calloc( 1, sizeof(*egl) ))) break; TRACE( "Initializing EGL device %p\n", devices[i] ); @@ -2396,35 +2398,24 @@ static const char *win32u_wglQueryRendererStringWINE( HDC hdc, GLint renderer, G return query_renderer_string( egl, attribute ); } -static struct egl_platform *egl_platform_from_device( EGLDeviceEXT device ) -{ - struct egl_platform *egl; - - LIST_FOR_EACH_ENTRY( egl, &devices_egl, struct egl_platform, entry ) - if (egl->device == device) return egl; - - WARN( "Cannot find current renderer\n" ); - return NULL; -} - static BOOL win32u_wglQueryCurrentRendererIntegerWINE( GLenum attribute, GLuint *value ) { - struct egl_platform *egl; + struct list *ptr; TRACE( "attribute %#x, value %p\n", attribute, value ); - if (!(egl = egl_platform_from_device( display_egl.device ))) return FALSE; - return query_renderer_integer( egl, attribute, value ); + if (!(ptr = list_head( &devices_egl ))) return FALSE; + return query_renderer_integer( LIST_ENTRY( ptr, struct egl_platform, entry ), attribute, value ); } static const char *win32u_wglQueryCurrentRendererStringWINE( GLenum attribute ) { - struct egl_platform *egl; + struct list *ptr; TRACE( "attribute %#x\n", attribute ); - if (!(egl = egl_platform_from_device( display_egl.device ))) return NULL; - return query_renderer_string( egl, attribute ); + if (!(ptr = list_head( &devices_egl ))) return NULL; + return query_renderer_string( LIST_ENTRY( ptr, struct egl_platform, entry ), attribute ); } static void display_funcs_init(void) @@ -2528,7 +2519,7 @@ static void display_funcs_init(void) display_funcs.p_wglSwapIntervalEXT = win32u_wglSwapIntervalEXT; display_funcs.p_wglGetSwapIntervalEXT = win32u_wglGetSwapIntervalEXT; - if (display_egl.device && !list_empty( &devices_egl )) + if (!list_empty( &devices_egl )) { register_extension( wgl_extensions, ARRAY_SIZE(wgl_extensions), "WGL_WINE_query_renderer" ); display_funcs.p_wglQueryCurrentRendererIntegerWINE = win32u_wglQueryCurrentRendererIntegerWINE; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9541
From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58833 --- dlls/win32u/opengl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c index f420f9acd97..90c975df0a5 100644 --- a/dlls/win32u/opengl.c +++ b/dlls/win32u/opengl.c @@ -1155,6 +1155,8 @@ static void init_device_info( struct egl_platform *egl, const struct opengl_func if (compat_context) funcs->p_eglDestroyContext( egl->display, compat_context ); if (core_context) funcs->p_eglDestroyContext( egl->display, core_context ); + + if (egl != &display_egl) funcs->p_eglTerminate( egl->display ); } static const struct -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9541
From: Rémi Bernon <rbernon(a)codeweavers.com> Initializing llvmpipe device involves creating a lot of threads, which consume large amount of address space which will never be freed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58833 --- dlls/win32u/opengl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c index 90c975df0a5..e083d26a6ff 100644 --- a/dlls/win32u/opengl.c +++ b/dlls/win32u/opengl.c @@ -990,6 +990,11 @@ static void init_egl_devices( struct opengl_funcs *funcs ) for (int i = 0; i < count; i++) { if (devices[i] == display_egl.device) continue; + + extensions = funcs->p_eglQueryDeviceStringEXT( devices[i], EGL_EXTENSIONS ); + /* Assume that all devices without EGL_MESA_device_software are accelerated. */ + if (has_extension( extensions, "EGL_MESA_device_software" )) continue; + if (!(egl = calloc( 1, sizeof(*egl) ))) break; TRACE( "Initializing EGL device %p\n", devices[i] ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9541
Doesn't this prevent llvmpipe from being used? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9541#note_123140
Not if it's the "display" (ie: primary) device, that one is always enumerated. It only ignores llvmpipe if it's one of the extra EGL devices. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9541#note_123150
participants (2)
-
Elizabeth Figura (＠zfigura) -
Rémi Bernon