isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 15:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make it possible to build without GLX support

Browse Source
This commit is contained in:
Jonas Ådahl 2018-11-06 16:18:56 +01:00
parent bf42b54faa
commit f139360569
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -290,6 +290,8 @@ AS_IF([test "$have_native_backend" = "yes"], [
]) ])
AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test "$have_native_backend" = "yes"]) AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test "$have_native_backend" = "yes"])
AC_DEFINE([HAVE_EGL],[1], [Defined if EGL support is enabled])
MUTTER_WAYLAND_EGLSTREAM_MODULES="wayland-eglstream-protocols" MUTTER_WAYLAND_EGLSTREAM_MODULES="wayland-eglstream-protocols"
AC_ARG_ENABLE(egl-device, AC_ARG_ENABLE(egl-device,

6
src/backends/meta-backend.c
View File

@ -91,7 +91,9 @@ struct _MetaBackendPrivate
MetaCursorRenderer *cursor_renderer; MetaCursorRenderer *cursor_renderer;
MetaInputSettings *input_settings; MetaInputSettings *input_settings;
MetaRenderer *renderer; MetaRenderer *renderer;
#ifdef HAVE_EGL
MetaEgl *egl; MetaEgl *egl;
#endif
MetaSettings *settings; MetaSettings *settings;
#ifdef HAVE_REMOTE_DESKTOP #ifdef HAVE_REMOTE_DESKTOP
MetaRemoteAccessController *remote_access_controller; MetaRemoteAccessController *remote_access_controller;
@ -774,7 +776,9 @@ meta_backend_initable_init (GInitable *initable,
priv->settings = meta_settings_new (backend); priv->settings = meta_settings_new (backend);
#ifdef HAVE_EGL
priv->egl = g_object_new (META_TYPE_EGL, NULL); priv->egl = g_object_new (META_TYPE_EGL, NULL);
#endif
priv->orientation_manager = g_object_new (META_TYPE_ORIENTATION_MANAGER, NULL); priv->orientation_manager = g_object_new (META_TYPE_ORIENTATION_MANAGER, NULL);
@ -885,6 +889,7 @@ meta_backend_get_renderer (MetaBackend *backend)
return priv->renderer; return priv->renderer;
} }
#ifdef HAVE_EGL
/** /**
* meta_backend_get_egl: (skip) * meta_backend_get_egl: (skip)
*/ */
@ -895,6 +900,7 @@ meta_backend_get_egl (MetaBackend *backend)
return priv->egl; return priv->egl;
} }
#endif /* HAVE_EGL */
/** /**
* meta_backend_get_settings: (skip) * meta_backend_get_settings: (skip)

4
src/backends/x11/meta-renderer-x11.c
View File

@ -60,7 +60,11 @@ get_x11_cogl_winsys_vtable (CoglRenderer *renderer)
#endif #endif
case COGL_DRIVER_GL: case COGL_DRIVER_GL:
case COGL_DRIVER_GL3: case COGL_DRIVER_GL3:
#ifdef COGL_HAS_GLX_SUPPORT
return _cogl_winsys_glx_get_vtable (); return _cogl_winsys_glx_get_vtable ();
#else
break;
#endif
case COGL_DRIVER_ANY: case COGL_DRIVER_ANY:
case COGL_DRIVER_NOP: case COGL_DRIVER_NOP:
break; break;