diff options
| author | Robert Bragg <robert@linux.intel.com> | 2011-07-01 01:58:38 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2011-07-11 14:07:01 +0100 |
| commit | 38b67e2884f44a7647dbcd9a72b79d9147d180c1 (patch) | |
| tree | 626473a2bc13de4ab96e7ca3e2ff1bc3b1513b6f /cogl | |
| parent | b2e735ff7f4094056765ff6adb5c74fd51d11e4a (diff) | |
| download | cogl-38b67e2884f44a7647dbcd9a72b79d9147d180c1.tar.gz | |
onscreen: make platform specific onscreen apis consistent
There were several CoglOnscreen functions named like:
cogl_onscreen_<platform>_blah instead of cogl_<platform>_onscreen_blah
so this patch updates those to be consistent with other platform
specific apis we have in cogl.
Signed-off-by: Neil Roberts <neil@linux.intel.com>
Diffstat (limited to 'cogl')
| -rw-r--r-- | cogl/cogl-framebuffer.c | 10 | ||||
| -rw-r--r-- | cogl/cogl-framebuffer.h | 28 |
2 files changed, 19 insertions, 19 deletions
diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c index 7cf6048c..0d718832 100644 --- a/cogl/cogl-framebuffer.c +++ b/cogl/cogl-framebuffer.c @@ -1629,7 +1629,7 @@ cogl_framebuffer_swap_region (CoglFramebuffer *framebuffer, #ifdef COGL_HAS_X11_SUPPORT void -cogl_onscreen_x11_set_foreign_window_xid (CoglOnscreen *onscreen, +cogl_x11_onscreen_set_foreign_window_xid (CoglOnscreen *onscreen, guint32 xid, CoglOnscreenX11MaskCallback update, void *user_data) @@ -1644,7 +1644,7 @@ cogl_onscreen_x11_set_foreign_window_xid (CoglOnscreen *onscreen, } guint32 -cogl_onscreen_x11_get_window_xid (CoglOnscreen *onscreen) +cogl_x11_onscreen_get_window_xid (CoglOnscreen *onscreen) { CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen); @@ -1662,7 +1662,7 @@ cogl_onscreen_x11_get_window_xid (CoglOnscreen *onscreen) } guint32 -cogl_onscreen_x11_get_visual_xid (CoglOnscreen *onscreen) +cogl_x11_onscreen_get_visual_xid (CoglOnscreen *onscreen) { CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen); const CoglWinsysVtable *winsys = _cogl_framebuffer_get_winsys (framebuffer); @@ -1683,14 +1683,14 @@ cogl_onscreen_x11_get_visual_xid (CoglOnscreen *onscreen) #ifdef COGL_HAS_WIN32_SUPPORT void -cogl_onscreen_win32_set_foreign_window (CoglOnscreen *onscreen, +cogl_win32_onscreen_set_foreign_window (CoglOnscreen *onscreen, HWND hwnd) { onscreen->foreign_hwnd = hwnd; } HWND -cogl_onscreen_win32_get_window (CoglOnscreen *onscreen) +cogl_win32_onscreen_get_window (CoglOnscreen *onscreen) { if (onscreen->foreign_hwnd) return onscreen->foreign_hwnd; diff --git a/cogl/cogl-framebuffer.h b/cogl/cogl-framebuffer.h index fcf29144..77df4344 100644 --- a/cogl/cogl-framebuffer.h +++ b/cogl/cogl-framebuffer.h @@ -225,7 +225,7 @@ typedef void (*CoglOnscreenX11MaskCallback) (CoglOnscreen *onscreen, void *user_data); /** - * cogl_onscreen_x11_set_foreign_window_xid: + * cogl_x11_onscreen_set_foreign_window_xid: * @onscreen: The unallocated framebuffer to associated with an X * window. * @xid: The XID of an existing X window @@ -263,7 +263,7 @@ typedef void (*CoglOnscreenX11MaskCallback) (CoglOnscreen *onscreen, * * { * *snip* - * cogl_onscreen_x11_set_foreign_window_xid (onscreen, + * cogl_x11_onscreen_set_foreign_window_xid (onscreen, * data->xwin, * my_update_cogl_x11_event_mask, * data); @@ -274,33 +274,33 @@ typedef void (*CoglOnscreenX11MaskCallback) (CoglOnscreen *onscreen, * Since: 2.0 * Stability: Unstable */ -#define cogl_onscreen_x11_set_foreign_window_xid \ - cogl_onscreen_x11_set_foreign_window_xid_EXP +#define cogl_x11_onscreen_set_foreign_window_xid \ + cogl_x11_onscreen_set_foreign_window_xid_EXP void -cogl_onscreen_x11_set_foreign_window_xid (CoglOnscreen *onscreen, +cogl_x11_onscreen_set_foreign_window_xid (CoglOnscreen *onscreen, guint32 xid, CoglOnscreenX11MaskCallback update, void *user_data); -#define cogl_onscreen_x11_get_window_xid cogl_onscreen_x11_get_window_xid_EXP +#define cogl_x11_onscreen_get_window_xid cogl_x11_onscreen_get_window_xid_EXP guint32 -cogl_onscreen_x11_get_window_xid (CoglOnscreen *onscreen); +cogl_x11_onscreen_get_window_xid (CoglOnscreen *onscreen); -#define cogl_onscreen_x11_get_visual_xid cogl_onscreen_x11_get_visual_xid_EXP +#define cogl_x11_onscreen_get_visual_xid cogl_x11_onscreen_get_visual_xid_EXP guint32 -cogl_onscreen_x11_get_visual_xid (CoglOnscreen *onscreen); +cogl_x11_onscreen_get_visual_xid (CoglOnscreen *onscreen); #endif /* COGL_HAS_X11 */ #ifdef COGL_HAS_WIN32_SUPPORT -#define cogl_onscreen_win32_set_foreign_window \ - cogl_onscreen_win32_set_foreign_window_EXP +#define cogl_win32_onscreen_set_foreign_window \ + cogl_win32_onscreen_set_foreign_window_EXP void -cogl_onscreen_win32_set_foreign_window (CoglOnscreen *onscreen, +cogl_win32_onscreen_set_foreign_window (CoglOnscreen *onscreen, HWND hwnd); -#define cogl_onscreen_win32_get_window cogl_onscreen_win32_get_window_EXP +#define cogl_win32_onscreen_get_window cogl_win32_onscreen_get_window_EXP HWND -cogl_onscreen_win32_get_window (CoglOnscreen *onscreen); +cogl_win32_onscreen_get_window (CoglOnscreen *onscreen); #endif /* COGL_HAS_WIN32_SUPPORT */ #if COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT |