[mutter] cogl/onscreen/egl: Move pending_resize_notify to Xlib platform
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl/onscreen/egl: Move pending_resize_notify to Xlib platform
- Date: Sat, 30 Jan 2021 09:39:48 +0000 (UTC)
commit 760a07cc24b0eb4bd2f89b3b146c61fb92edb1f4
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Sat Oct 17 00:56:07 2020 +0200
cogl/onscreen/egl: Move pending_resize_notify to Xlib platform
It's only used in the Xlib onscreen, so move it there.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1514>
cogl/cogl/winsys/cogl-winsys-egl-private.h | 2 --
cogl/cogl/winsys/cogl-winsys-egl-x11.c | 11 ++++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-private.h b/cogl/cogl/winsys/cogl-winsys-egl-private.h
index a290268131..96b49f808b 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-egl-private.h
@@ -169,8 +169,6 @@ typedef struct _CoglOnscreenEGL
{
EGLSurface egl_surface;
- gboolean pending_resize_notify;
-
/* Platform specific data */
void *platform;
} CoglOnscreenEGL;
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
index cec9a0f2d4..92e3871cea 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
@@ -60,6 +60,8 @@ typedef struct _CoglDisplayXlib
typedef struct _CoglOnscreenXlib
{
Window xwin;
+
+ gboolean pending_resize_notify;
} CoglOnscreenXlib;
#ifdef EGL_KHR_image_pixmap
@@ -103,11 +105,12 @@ flush_pending_resize_notifications_cb (void *data,
{
CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
CoglOnscreenEGL *egl_onscreen = cogl_onscreen_get_winsys (onscreen);
+ CoglOnscreenXlib *xlib_onscreen = egl_onscreen->platform;
- if (egl_onscreen->pending_resize_notify)
+ if (xlib_onscreen->pending_resize_notify)
{
_cogl_onscreen_notify_resize (onscreen);
- egl_onscreen->pending_resize_notify = FALSE;
+ xlib_onscreen->pending_resize_notify = FALSE;
}
}
}
@@ -140,6 +143,7 @@ notify_resize (CoglContext *context,
CoglOnscreen *onscreen = find_onscreen_for_xid (context, drawable);
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
CoglOnscreenEGL *egl_onscreen;
+ CoglOnscreenXlib *xlib_onscreen;
if (!onscreen)
return;
@@ -160,7 +164,8 @@ notify_resize (CoglContext *context,
NULL);
}
- egl_onscreen->pending_resize_notify = TRUE;
+ xlib_onscreen = egl_onscreen->platform;
+ xlib_onscreen->pending_resize_notify = TRUE;
}
static CoglFilterReturn
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]