brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl/egl: Choose config only if needed

Browse Source 
In try_create_context(), if COGL_EGL_WINSYS_FEATURE_NO_CONFIG_CONTEXT
is set, don't try to choose an egl config.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4088>
This commit is contained in:
Jocelyn Falempe 2024-10-18 17:19:14 +02:00 committed by Marge Bot
parent fb86d5d5b0
commit 18085b0e40
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl/winsys/cogl-winsys-egl-private.h
View File

@ -121,6 +121,8 @@ typedef struct _CoglRendererEGL
/* vtable for platform specific parts */ /* vtable for platform specific parts */
const CoglWinsysEGLVtable *platform_vtable; const CoglWinsysEGLVtable *platform_vtable;
gboolean needs_config;
/* Sync for latest submitted work */ /* Sync for latest submitted work */
EGLSyncKHR sync; EGLSyncKHR sync;

1
cogl/cogl/winsys/cogl-winsys-egl-x11.c
View File

@ -243,6 +243,7 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer,
egl_renderer->platform_vtable = &_cogl_winsys_egl_vtable; egl_renderer->platform_vtable = &_cogl_winsys_egl_vtable;
egl_renderer->sync = EGL_NO_SYNC_KHR; egl_renderer->sync = EGL_NO_SYNC_KHR;
egl_renderer->needs_config = TRUE;
if (!_cogl_xlib_renderer_connect (renderer, error)) if (!_cogl_xlib_renderer_connect (renderer, error))
goto error; goto error;

27
cogl/cogl/winsys/cogl-winsys-egl.c
View File

@ -318,19 +318,24 @@ try_create_context (CoglDisplay *display,
edpy = egl_renderer->edpy; edpy = egl_renderer->edpy;
if (!egl_renderer->platform_vtable->choose_config (display, if (!(egl_renderer->private_features &
cfg_attribs, COGL_EGL_WINSYS_FEATURE_NO_CONFIG_CONTEXT) ||
&config, egl_renderer->needs_config)
&config_error))
{ {
g_set_error (error, COGL_WINSYS_ERROR, if (!egl_renderer->platform_vtable->choose_config (display,
COGL_WINSYS_ERROR_CREATE_CONTEXT, cfg_attribs,
"Couldn't choose config: %s", config_error->message); &config,
g_error_free (config_error); &config_error))
goto err; {
} g_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_CREATE_CONTEXT,
"Couldn't choose config: %s", config_error->message);
g_error_free (config_error);
goto err;
}
egl_display->egl_config = config; egl_display->egl_config = config;
}
if (display->renderer->driver == COGL_DRIVER_GL3) if (display->renderer->driver == COGL_DRIVER_GL3)
{ {