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

cogl: Stop storing XDisplay on the Renderer

Browse Source 
Instead, only store it in the XlibRenderer data and drop the code
related to connecting to XDisplay as MetaX11Display handles that
already.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4186>
This commit is contained in:
Bilal Elmoussaoui 2024-12-12 21:38:39 +01:00
parent 07fa87907e
commit c913a33d6a
3 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogl/cogl/cogl-renderer-private.h
View File

@ -56,10 +56,6 @@ struct _CoglRenderer
CoglList idle_closures; CoglList idle_closures;
#ifdef HAVE_X11
Display *foreign_xdpy;
#endif
CoglDriverId driver_id; CoglDriverId driver_id;
unsigned long private_features unsigned long private_features
[COGL_FLAGS_N_LONGS_FOR_SIZE (COGL_N_PRIVATE_FEATURES)]; [COGL_FLAGS_N_LONGS_FOR_SIZE (COGL_N_PRIVATE_FEATURES)];

6
cogl/cogl/cogl-renderer.c
View File

@ -65,6 +65,7 @@
#ifdef HAVE_X11 #ifdef HAVE_X11
#include "cogl/cogl-xlib-renderer.h" #include "cogl/cogl-xlib-renderer.h"
#include "cogl/cogl-xlib-renderer-private.h"
#endif #endif
@ -200,13 +201,14 @@ void
cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer, cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer,
Display *xdisplay) Display *xdisplay)
{ {
CoglXlibRenderer *xlib_renderer;
g_return_if_fail (COGL_IS_RENDERER (renderer)); g_return_if_fail (COGL_IS_RENDERER (renderer));
/* NB: Renderers are considered immutable once connected */ /* NB: Renderers are considered immutable once connected */
g_return_if_fail (!renderer->connected); g_return_if_fail (!renderer->connected);
renderer->foreign_xdpy = xdisplay; xlib_renderer = _cogl_xlib_renderer_get_data (renderer);
xlib_renderer->xdpy = xdisplay;
} }
#endif /* HAVE_X11 */ #endif /* HAVE_X11 */

34
cogl/cogl/cogl-xlib-renderer.c
View File

@ -46,7 +46,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
static char *_cogl_x11_display_name = NULL;
static GList *_cogl_xlib_renderers = NULL; static GList *_cogl_xlib_renderers = NULL;
static void static void
@ -88,33 +87,6 @@ unregister_xlib_renderer (CoglRenderer *renderer)
_cogl_xlib_renderers = g_list_remove (_cogl_xlib_renderers, renderer); _cogl_xlib_renderers = g_list_remove (_cogl_xlib_renderers, renderer);
} }
static Display *
assert_xlib_display (CoglRenderer *renderer, GError **error)
{
Display *xdpy = renderer->foreign_xdpy;
CoglXlibRenderer *xlib_renderer = _cogl_xlib_renderer_get_data (renderer);
/* A foreign display may have already been set... */
if (xdpy)
{
xlib_renderer->xdpy = xdpy;
return xdpy;
}
xdpy = XOpenDisplay (_cogl_x11_display_name);
if (xdpy == NULL)
{
g_set_error (error,
COGL_RENDERER_ERROR,
COGL_RENDERER_ERROR_XLIB_DISPLAY_OPEN,
"Failed to open X Display %s", _cogl_x11_display_name);
return NULL;
}
xlib_renderer->xdpy = xdpy;
return xdpy;
}
static void static void
free_xlib_output (CoglXlibOutput *output) free_xlib_output (CoglXlibOutput *output)
{ {
@ -402,8 +374,7 @@ _cogl_xlib_renderer_connect (CoglRenderer *renderer, GError **error)
int damage_error; int damage_error;
int randr_error; int randr_error;
if (!assert_xlib_display (renderer, error)) g_return_val_if_fail (xlib_renderer->xdpy != NULL, FALSE);
return FALSE;
if (getenv ("COGL_X11_SYNC")) if (getenv ("COGL_X11_SYNC"))
XSynchronize (xlib_renderer->xdpy, TRUE); XSynchronize (xlib_renderer->xdpy, TRUE);
@ -445,9 +416,6 @@ _cogl_xlib_renderer_disconnect (CoglRenderer *renderer)
g_list_free_full (xlib_renderer->outputs, (GDestroyNotify) free_xlib_output); g_list_free_full (xlib_renderer->outputs, (GDestroyNotify) free_xlib_output);
xlib_renderer->outputs = NULL; xlib_renderer->outputs = NULL;
if (!renderer->foreign_xdpy && xlib_renderer->xdpy)
XCloseDisplay (xlib_renderer->xdpy);
g_clear_pointer (&renderer->custom_winsys_user_data, _xlib_renderer_data_free); g_clear_pointer (&renderer->custom_winsys_user_data, _xlib_renderer_data_free);
unregister_xlib_renderer (renderer); unregister_xlib_renderer (renderer);