brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename cogl_framebuffer_swap_* apis to cogl_onscreen_swap_*

Browse Source 
Recently the cogl_framebuffer_swap_* apis were moved into the
cogl_onscreen_* namespace since only CoglOnscreen framebuffers can be
double buffered. This renames all uses of the cogl_framebuffer_swap_*
apis in Clutter.
This commit is contained in:
Robert Bragg 2012-02-21 13:37:55 +00:00
parent fbf94310fc
commit 671ead6681
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
clutter/cogl/clutter-stage-cogl.c
View File

@ -138,9 +138,9 @@ clutter_stage_cogl_realize (ClutterStageWindow *stage_window)
if (cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_SWAP_BUFFERS_EVENT)) if (cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_SWAP_BUFFERS_EVENT))
{ {
stage_cogl->swap_callback_id = stage_cogl->swap_callback_id =
cogl_framebuffer_add_swap_buffers_callback (framebuffer, cogl_onscreen_add_swap_buffers_callback (stage_cogl->onscreen,
handle_swap_complete_cb, handle_swap_complete_cb,
stage_cogl); stage_cogl);
} }
return TRUE; return TRUE;
@ -462,7 +462,7 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
int copy_area[4]; int copy_area[4];
/* XXX: It seems there will be a race here in that the stage /* XXX: It seems there will be a race here in that the stage
* window may be resized before the cogl_framebuffer_swap_region * window may be resized before the cogl_onscreen_swap_region
* is handled and so we may copy the wrong region. I can't * is handled and so we may copy the wrong region. I can't
* really see how we can handle this with the current state of X * really see how we can handle this with the current state of X
* but at least in this case a full redraw should be queued by * but at least in this case a full redraw should be queued by
@ -476,33 +476,32 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
copy_area[3] = clip->height; copy_area[3] = clip->height;
CLUTTER_NOTE (BACKEND, CLUTTER_NOTE (BACKEND,
"cogl_framebuffer_swap_region (onscreen: %p, " "cogl_onscreen_swap_region (onscreen: %p, "
"x: %d, y: %d, " "x: %d, y: %d, "
"width: %d, height: %d)", "width: %d, height: %d)",
stage_cogl->onscreen, stage_cogl->onscreen,
copy_area[0], copy_area[1], copy_area[2], copy_area[3]); copy_area[0], copy_area[1], copy_area[2], copy_area[3]);
CLUTTER_TIMER_START (_clutter_uprof_context, blit_sub_buffer_timer); CLUTTER_TIMER_START (_clutter_uprof_context, blit_sub_buffer_timer);
cogl_framebuffer_swap_region (COGL_FRAMEBUFFER (stage_cogl->onscreen), cogl_onscreen_swap_region (stage_cogl->onscreen, copy_area, 1);
copy_area, 1);
CLUTTER_TIMER_STOP (_clutter_uprof_context, blit_sub_buffer_timer); CLUTTER_TIMER_STOP (_clutter_uprof_context, blit_sub_buffer_timer);
} }
else else
{ {
CLUTTER_NOTE (BACKEND, "cogl_framebuffer_swap_buffers (onscreen: %p)", CLUTTER_NOTE (BACKEND, "cogl_onscreen_swap_buffers (onscreen: %p)",
stage_cogl->onscreen); stage_cogl->onscreen);
/* If we have swap buffer events then /* If we have swap buffer events then cogl_onscreen_swap_buffers
* cogl_framebuffer_swap_buffers will return immediately and we * will return immediately and we need to track that there is a
* need to track that there is a swap in progress... */ * swap in progress... */
if (clutter_feature_available (CLUTTER_FEATURE_SWAP_EVENTS)) if (clutter_feature_available (CLUTTER_FEATURE_SWAP_EVENTS))
stage_cogl->pending_swaps++; stage_cogl->pending_swaps++;
CLUTTER_TIMER_START (_clutter_uprof_context, swapbuffers_timer); CLUTTER_TIMER_START (_clutter_uprof_context, swapbuffers_timer);
cogl_framebuffer_swap_buffers (COGL_FRAMEBUFFER (stage_cogl->onscreen)); cogl_onscreen_swap_buffers (stage_cogl->onscreen);
CLUTTER_TIMER_STOP (_clutter_uprof_context, swapbuffers_timer); CLUTTER_TIMER_STOP (_clutter_uprof_context, swapbuffers_timer);
} }

2
clutter/win32/clutter-stage-win32.c
View File

@ -542,7 +542,7 @@ clutter_stage_win32_redraw (ClutterStageWindow *stage_window)
cogl_flush (); cogl_flush ();
if (stage_win32->onscreen) if (stage_win32->onscreen)
cogl_framebuffer_swap_buffers (COGL_FRAMEBUFFER (stage_win32->onscreen)); cogl_onscreen_swap_buffers (COGL_FRAMEBUFFER (stage_win32->onscreen));
} }
static CoglFramebuffer * static CoglFramebuffer *