isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-19 14:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates wayland symbol names to be consistent

Browse Source 
This updates the public wayland symbols to follow the pattern
cogl_wayland_blah instead of cogl_blah_wayland.

Signed-off-by: Neil Roberts <neil@linux.intel.com>
This commit is contained in:
Robert Bragg 2011-06-28 14:57:05 +01:00
parent 89562dda73
commit cd6e1d183d
6 changed files with 76 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cogl/Makefile.am
View File

@ -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

28
cogl/cogl-renderer.h
View File

@ -33,10 +33,6 @@
#include <cogl/cogl-types.h>
#include <cogl/cogl-onscreen-template.h>
#if COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
#include <wayland-client.h>
#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 \

62
cogl/cogl-wayland-renderer.h Normal file
View File

@ -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 <cogl/cogl.h> can be included directly."
#endif
#ifndef __COGL_WAYLAND_RENDERER_H__
#define __COGL_WAYLAND_RENDERER_H__
#include <cogl/cogl-types.h>
#include <cogl/cogl-renderer.h>
#include <wayland-client.h>
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__ */

3
cogl/cogl.h
View File

@ -93,6 +93,9 @@ typedef struct _CoglFramebuffer CoglFramebuffer;
#include <cogl/cogl-xlib.h>
#include <cogl/cogl-xlib-renderer.h>
#endif
#if COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
#include <cogl/cogl-wayland-renderer.h>
#endif
/* XXX: This will definitly go away once all the Clutter winsys
* code has been migrated down into Cogl! */
#include <cogl/cogl-clutter.h>

8
cogl/winsys/cogl-winsys-egl.c
View File

@ -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);

8
doc/reference/cogl-2.0-experimental/cogl-sections.txt
View File

@ -33,10 +33,10 @@ cogl_win32_renderer_remove_native_filter
cogl_win32_renderer_handle_native_event
<SUBSECTION>
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
</SECTION>
<SECTION>