From cd6e1d183de0f8c85f0e957609e965675c4b280d Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 28 Jun 2011 14:57:05 +0100 Subject: [PATCH] Updates wayland symbol names to be consistent This updates the public wayland symbols to follow the pattern cogl_wayland_blah instead of cogl_blah_wayland. Signed-off-by: Neil Roberts --- cogl/Makefile.am | 3 + cogl/cogl-renderer.h | 28 --------- cogl/cogl-wayland-renderer.h | 62 +++++++++++++++++++ cogl/cogl.h | 3 + cogl/winsys/cogl-winsys-egl.c | 8 +-- .../cogl-2.0-experimental/cogl-sections.txt | 8 +-- 6 files changed, 76 insertions(+), 36 deletions(-) create mode 100644 cogl/cogl-wayland-renderer.h diff --git a/cogl/Makefile.am b/cogl/Makefile.am index 26069b8bf..7fbe55b3b 100644 --- a/cogl/Makefile.am +++ b/cogl/Makefile.am @@ -355,6 +355,9 @@ cogl_sources_c += \ $(srcdir)/winsys/cogl-winsys-egl-private.h endif if SUPPORT_EGL_PLATFORM_WAYLAND +cogl_public_h += \ + $(srcdir)/cogl-wayland-renderer.h + cogl_sources_c += \ $(srcdir)/winsys/cogl-winsys-egl.c \ $(srcdir)/winsys/cogl-winsys-egl-private.h diff --git a/cogl/cogl-renderer.h b/cogl/cogl-renderer.h index 019495800..2b3b9e3a3 100644 --- a/cogl/cogl-renderer.h +++ b/cogl/cogl-renderer.h @@ -33,10 +33,6 @@ #include #include -#if COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT -#include -#endif - G_BEGIN_DECLS /** @@ -118,30 +114,6 @@ cogl_renderer_set_winsys_id (CoglRenderer *renderer, CoglWinsysID cogl_renderer_get_winsys_id (CoglRenderer *renderer); -#if COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT -#define cogl_renderer_wayland_set_foreign_display \ - cogl_renderer_wayland_set_foreign_display_EXP -void -cogl_renderer_wayland_set_foreign_display (CoglRenderer *renderer, - struct wl_display *display); - -#define cogl_renderer_wayland_get_display \ - cogl_renderer_wayland_get_display_EXP -struct wl_display * -cogl_renderer_wayland_get_display (CoglRenderer *renderer); - -#define cogl_renderer_wayland_set_foreign_compositor \ - cogl_renderer_wayland_set_foreign_compositor_EXP -void -cogl_renderer_wayland_set_foreign_compositor (CoglRenderer *renderer, - struct wl_compositor *compositor); - -#define cogl_renderer_wayland_get_compositor \ - cogl_renderer_wayland_get_compositor_EXP -struct wl_compositor * -cogl_renderer_wayland_get_compositor (CoglRenderer *renderer); -#endif /* COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT */ - #ifdef COGL_HAS_WGL_SUPPORT #define cogl_win32_renderer_handle_event \ diff --git a/cogl/cogl-wayland-renderer.h b/cogl/cogl-wayland-renderer.h new file mode 100644 index 000000000..7e155f4f4 --- /dev/null +++ b/cogl/cogl-wayland-renderer.h @@ -0,0 +1,62 @@ +/* + * Cogl + * + * An object oriented GL/GLES Abstraction/Utility Layer + * + * Copyright (C) 2011 Intel Corporation. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#error "Only can be included directly." +#endif + +#ifndef __COGL_WAYLAND_RENDERER_H__ +#define __COGL_WAYLAND_RENDERER_H__ + +#include +#include + +#include + +G_BEGIN_DECLS + +#define cogl_wayland_renderer_set_foreign_display \ + cogl_wayland_renderer_set_foreign_display_EXP +void +cogl_wayland_renderer_set_foreign_display (CoglRenderer *renderer, + struct wl_display *display); + +#define cogl_wayland_renderer_get_display \ + cogl_wayland_renderer_get_display_EXP +struct wl_display * +cogl_wayland_renderer_get_display (CoglRenderer *renderer); + +#define cogl_wayland_renderer_set_foreign_compositor \ + cogl_wayland_renderer_set_foreign_compositor_EXP +void +cogl_wayland_renderer_set_foreign_compositor (CoglRenderer *renderer, + struct wl_compositor *compositor); + +#define cogl_wayland_renderer_get_compositor \ + cogl_wayland_renderer_get_compositor_EXP +struct wl_compositor * +cogl_wayland_renderer_get_compositor (CoglRenderer *renderer); + +G_END_DECLS + +#endif /* __COGL_WAYLAND_RENDERER_H__ */ diff --git a/cogl/cogl.h b/cogl/cogl.h index 1aece0bbc..06f098559 100644 --- a/cogl/cogl.h +++ b/cogl/cogl.h @@ -93,6 +93,9 @@ typedef struct _CoglFramebuffer CoglFramebuffer; #include #include #endif +#if COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT +#include +#endif /* XXX: This will definitly go away once all the Clutter winsys * code has been migrated down into Cogl! */ #include diff --git a/cogl/winsys/cogl-winsys-egl.c b/cogl/winsys/cogl-winsys-egl.c index bbf3e1360..462636597 100644 --- a/cogl/winsys/cogl-winsys-egl.c +++ b/cogl/winsys/cogl-winsys-egl.c @@ -1709,7 +1709,7 @@ _cogl_winsys_egl_get_vtable (void) * points... */ #ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT void -cogl_renderer_wayland_set_foreign_display (CoglRenderer *renderer, +cogl_wayland_renderer_set_foreign_display (CoglRenderer *renderer, struct wl_display *display) { g_return_if_fail (cogl_is_renderer (renderer)); @@ -1721,7 +1721,7 @@ cogl_renderer_wayland_set_foreign_display (CoglRenderer *renderer, } struct wl_display * -cogl_renderer_wayland_get_display (CoglRenderer *renderer) +cogl_wayland_renderer_get_display (CoglRenderer *renderer) { g_return_val_if_fail (cogl_is_renderer (renderer), NULL); @@ -1737,7 +1737,7 @@ cogl_renderer_wayland_get_display (CoglRenderer *renderer) } void -cogl_renderer_wayland_set_foreign_compositor (CoglRenderer *renderer, +cogl_wayland_renderer_set_foreign_compositor (CoglRenderer *renderer, struct wl_compositor *compositor) { g_return_if_fail (cogl_is_renderer (renderer)); @@ -1749,7 +1749,7 @@ cogl_renderer_wayland_set_foreign_compositor (CoglRenderer *renderer, } struct wl_compositor * -cogl_renderer_wayland_get_compositor (CoglRenderer *renderer) +cogl_wayland_renderer_get_compositor (CoglRenderer *renderer) { g_return_val_if_fail (cogl_is_renderer (renderer), NULL); diff --git a/doc/reference/cogl-2.0-experimental/cogl-sections.txt b/doc/reference/cogl-2.0-experimental/cogl-sections.txt index d8f1bb734..02f793155 100644 --- a/doc/reference/cogl-2.0-experimental/cogl-sections.txt +++ b/doc/reference/cogl-2.0-experimental/cogl-sections.txt @@ -33,10 +33,10 @@ cogl_win32_renderer_remove_native_filter cogl_win32_renderer_handle_native_event -cogl_renderer_wayland_set_foreign_display -cogl_renderer_wayland_get_display -cogl_renderer_wayland_set_foreign_compositor -cogl_renderer_wayland_get_compositor +cogl_wayland_renderer_set_foreign_display +cogl_wayland_renderer_get_display +cogl_wayland_renderer_set_foreign_compositor +cogl_wayland_renderer_get_compositor