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
This commit is contained in:
parent
534e994972
commit
3e479a3326
@ -167,15 +167,6 @@ _clutter_backend_gdk_post_parse (ClutterBackend *backend,
|
|||||||
|
|
||||||
g_assert (backend_gdk->display != NULL);
|
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);
|
backend_gdk->screen = gdk_display_get_default_screen (backend_gdk->display);
|
||||||
|
|
||||||
/* add event filter for Cogl events */
|
/* add event filter for Cogl events */
|
||||||
|
@ -395,10 +395,6 @@ clutter_backend_x11_post_parse (ClutterBackend *backend,
|
|||||||
|
|
||||||
settings = clutter_settings_get_default ();
|
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 */
|
/* add event filter for Cogl events */
|
||||||
clutter_x11_add_filter (cogl_xlib_filter, NULL);
|
clutter_x11_add_filter (cogl_xlib_filter, NULL);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user