Commit 60dbeb94 authored by Emmanuele Bassi's avatar Emmanuele Bassi

Try again at using the GDK backend by default

We tried once with commit 398a7ac7 and ended up reverting because of
regressions in the input layer and on Wayland.

We should try again, now that those regressions have been fixed.

https://bugzilla.gnome.org/show_bug.cgi?id=734587
parent 7b9068b9
...@@ -491,6 +491,11 @@ _clutter_create_backend (void) ...@@ -491,6 +491,11 @@ _clutter_create_backend (void)
retval = g_object_new (CLUTTER_TYPE_BACKEND_WIN32, NULL); retval = g_object_new (CLUTTER_TYPE_BACKEND_WIN32, NULL);
else else
#endif #endif
#ifdef CLUTTER_WINDOWING_GDK
if (backend == NULL || backend == I_(CLUTTER_WINDOWING_GDK))
retval = g_object_new (CLUTTER_TYPE_BACKEND_GDK, NULL);
else
#endif
#ifdef CLUTTER_WINDOWING_X11 #ifdef CLUTTER_WINDOWING_X11
if (backend == NULL || backend == I_(CLUTTER_WINDOWING_X11)) if (backend == NULL || backend == I_(CLUTTER_WINDOWING_X11))
retval = g_object_new (CLUTTER_TYPE_BACKEND_X11, NULL); retval = g_object_new (CLUTTER_TYPE_BACKEND_X11, NULL);
...@@ -505,11 +510,6 @@ _clutter_create_backend (void) ...@@ -505,11 +510,6 @@ _clutter_create_backend (void)
if (backend == NULL || backend == I_(CLUTTER_WINDOWING_EGL)) if (backend == NULL || backend == I_(CLUTTER_WINDOWING_EGL))
retval = g_object_new (CLUTTER_TYPE_BACKEND_EGL_NATIVE, NULL); retval = g_object_new (CLUTTER_TYPE_BACKEND_EGL_NATIVE, NULL);
else else
#endif
#ifdef CLUTTER_WINDOWING_GDK
if (backend == NULL || backend == I_(CLUTTER_WINDOWING_GDK))
retval = g_object_new (CLUTTER_TYPE_BACKEND_GDK, NULL);
else
#endif #endif
if (backend == NULL) if (backend == NULL)
g_error ("No default Clutter backend found."); g_error ("No default Clutter backend found.");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment