[clutter] cogl: Don't use cogl_xlib_set_diplay()
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] cogl: Don't use cogl_xlib_set_diplay()
- Date: Wed, 20 Feb 2013 23:34:19 +0000 (UTC)
commit 3e479a3326dd8d14aa6cc479b4f33df294a01d3e
Author: Damien Lespiau <damien lespiau intel com>
Date: Mon Nov 5 14:41:36 2012 +0000
cogl: Don't use cogl_xlib_set_diplay()
This function is deprecated and has been replaced by set_display() on
the renderer. This is done in the get_renderer() vfunc of both the x11
and gdk backends already.
Actually cogl_xlib_set_diplay() is now a no-op and can be safely removed.
https://bugzilla.gnome.org/show_bug.cgi?id=687652
clutter/gdk/clutter-backend-gdk.c | 9 ---------
clutter/x11/clutter-backend-x11.c | 4 ----
2 files changed, 0 insertions(+), 13 deletions(-)
---
diff --git a/clutter/gdk/clutter-backend-gdk.c b/clutter/gdk/clutter-backend-gdk.c
index ca4c454..988b370 100644
--- a/clutter/gdk/clutter-backend-gdk.c
+++ b/clutter/gdk/clutter-backend-gdk.c
@@ -167,15 +167,6 @@ _clutter_backend_gdk_post_parse (ClutterBackend *backend,
g_assert (backend_gdk->display != NULL);
-#ifdef GDK_WINDOWING_X11
- if (GDK_IS_X11_DISPLAY (backend_gdk->display))
- {
- /* Cogl needs to know the Xlib display connection for
- CoglTexturePixmapX11 */
- cogl_xlib_set_display (gdk_x11_display_get_xdisplay (backend_gdk->display));
- }
-#endif
-
backend_gdk->screen = gdk_display_get_default_screen (backend_gdk->display);
/* add event filter for Cogl events */
diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
index 2d8f4ba..2315246 100644
--- a/clutter/x11/clutter-backend-x11.c
+++ b/clutter/x11/clutter-backend-x11.c
@@ -395,10 +395,6 @@ clutter_backend_x11_post_parse (ClutterBackend *backend,
settings = clutter_settings_get_default ();
- /* Cogl needs to know the Xlib display connection for
- CoglTexturePixmapX11 */
- cogl_xlib_set_display (backend_x11->xdpy);
-
/* add event filter for Cogl events */
clutter_x11_add_filter (cogl_xlib_filter, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]