isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move cogl_wayland_display_ proto to cogl-wayland-server.h

Browse Source 
We need to avoid including wayland-server.h or wayland-client.h
indirectly when including cogl.h because there are overlapping typedef
names between the client and server wayland headers and we can't assume
whether Cogl is being used client or server side. This moves the
prototype for cogl_wayland_display_set_compositor_display() into
cogl-wayland-server.h which Cogl apps must include explicitly if the
want access to server side Cogl Wayland symbols.

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit 0773107deb9eded408e2801f217462c5d551f15a)
This commit is contained in:
Robert Bragg 2012-08-06 17:22:49 +01:00
parent f31ce3d0f7
commit e347135b6a
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cogl/cogl-display.h
View File

@ -171,24 +171,6 @@ cogl_gdl_display_set_plane (CoglDisplay *display,
gdl_plane_id_t plane); gdl_plane_id_t plane);
#endif #endif
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
/**
* cogl_wayland_display_set_compositor_display:
* @display: a #CoglDisplay
* @wayland_display: A compositor's Wayland display pointer
*
* Informs Cogl of a compositor's Wayland display pointer. This
* enables Cogl to register private wayland extensions required to
* pass buffers between the clients and compositor.
*
* Since: 1.10
* Stability: unstable
*/
void
cogl_wayland_display_set_compositor_display (CoglDisplay *display,
struct wl_display *wayland_display);
#endif
/** /**
* cogl_is_display: * cogl_is_display:
* @object: A #CoglObject pointer * @object: A #CoglObject pointer

18
cogl/cogl-wayland-server.h
View File

@ -34,8 +34,22 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define cogl_wayland_texture_2d_new_from_buffer \ /**
cogl_wayland_texture_2d_new_from_buffer_EXP * cogl_wayland_display_set_compositor_display:
* @display: a #CoglDisplay
* @wayland_display: A compositor's Wayland display pointer
*
* Informs Cogl of a compositor's Wayland display pointer. This
* enables Cogl to register private wayland extensions required to
* pass buffers between the clients and compositor.
*
* Since: 1.10
* Stability: unstable
*/
void
cogl_wayland_display_set_compositor_display (CoglDisplay *display,
struct wl_display *wayland_display);
/** /**
* cogl_wayland_texture_2d_new_from_buffer: * cogl_wayland_texture_2d_new_from_buffer:
* @ctx: A #CoglContext * @ctx: A #CoglContext