sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Make it possible to build without EGL support

Browse source 
This will avoid building anything related to EGL. For meson, this will
mean that both the native backend an the Wayland support must also be
disabled.
This commit is contained in:
Jonas Ådahl 2018-08-16 16:20:38 +02:00
parent d48d56f831
commit bf42b54faa
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cogl/cogl/cogl-mutter.h
View file

@ -39,7 +39,9 @@
#include <cogl/cogl-error-private.h> #include <cogl/cogl-error-private.h>
#include <cogl/cogl-frame-info-private.h> #include <cogl/cogl-frame-info-private.h>
#include <cogl/cogl-renderer-private.h> #include <cogl/cogl-renderer-private.h>
#if defined (COGL_HAS_EGL_SUPPORT)
#include <cogl/winsys/cogl-winsys-egl-private.h> #include <cogl/winsys/cogl-winsys-egl-private.h>
#endif
#include <cogl/winsys/cogl-winsys-private.h> #include <cogl/winsys/cogl-winsys-private.h>
void cogl_renderer_set_custom_winsys (CoglRenderer *renderer, void cogl_renderer_set_custom_winsys (CoglRenderer *renderer,

2
cogl/cogl/cogl-texture-2d.c
View file

@ -385,6 +385,7 @@ cogl_wayland_texture_2d_new_from_buffer (CoglContext *ctx,
else else
return tex; return tex;
} }
#ifdef COGL_HAS_EGL_SUPPORT
else else
{ {
int format, width, height; int format, width, height;
@ -439,6 +440,7 @@ cogl_wayland_texture_2d_new_from_buffer (CoglContext *ctx,
return tex; return tex;
} }
} }
#endif /* COGL_HAS_EGL_SUPPORT */
_cogl_set_error (error, _cogl_set_error (error,
COGL_SYSTEM_ERROR, COGL_SYSTEM_ERROR,

4
cogl/cogl/driver/gl/cogl-texture-2d-gl.c
View file

@ -576,7 +576,11 @@ _cogl_texture_2d_gl_allocate (CoglTexture *tex,
case COGL_TEXTURE_SOURCE_TYPE_GL_FOREIGN: case COGL_TEXTURE_SOURCE_TYPE_GL_FOREIGN:
return allocate_from_gl_foreign (tex_2d, loader, error); return allocate_from_gl_foreign (tex_2d, loader, error);
case COGL_TEXTURE_SOURCE_TYPE_EGL_IMAGE_EXTERNAL: case COGL_TEXTURE_SOURCE_TYPE_EGL_IMAGE_EXTERNAL:
#if defined (COGL_HAS_EGL_SUPPORT)
return allocate_custom_egl_image_external (tex_2d, loader, error); return allocate_custom_egl_image_external (tex_2d, loader, error);
#else
g_return_val_if_reached (FALSE);
#endif
} }
g_return_val_if_reached (FALSE); g_return_val_if_reached (FALSE);

6
src/backends/x11/meta-renderer-x11.c
View file

@ -45,13 +45,19 @@ G_DEFINE_TYPE (MetaRendererX11, meta_renderer_x11, META_TYPE_RENDERER)
static const CoglWinsysVtable * static const CoglWinsysVtable *
get_x11_cogl_winsys_vtable (CoglRenderer *renderer) get_x11_cogl_winsys_vtable (CoglRenderer *renderer)
{ {
#ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
if (meta_is_wayland_compositor ()) if (meta_is_wayland_compositor ())
return _cogl_winsys_egl_xlib_get_vtable (); return _cogl_winsys_egl_xlib_get_vtable ();
#endif
switch (renderer->driver) switch (renderer->driver)
{ {
case COGL_DRIVER_GLES2: case COGL_DRIVER_GLES2:
#ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
return _cogl_winsys_egl_xlib_get_vtable (); return _cogl_winsys_egl_xlib_get_vtable ();
#else
break;
#endif
case COGL_DRIVER_GL: case COGL_DRIVER_GL:
case COGL_DRIVER_GL3: case COGL_DRIVER_GL3:
return _cogl_winsys_glx_get_vtable (); return _cogl_winsys_glx_get_vtable ();