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

ClutterStageWindow: Remove dirty_back_buffer vfunc

Browse Source 
It was dead code, so lets remove it.

https://bugzilla.gnome.org/show_bug.cgi?id=768976
This commit is contained in:
Jonas Ådahl 2016-05-24 11:53:14 +08:00
parent 14dbdfe483
commit df0805fb0a
4 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clutter/clutter/clutter-stage-window.c
View File

@ -288,18 +288,6 @@ _clutter_stage_window_get_dirty_pixel (ClutterStageWindow *window,
iface->get_dirty_pixel (window, x, y); iface->get_dirty_pixel (window, x, y);
} }
void
_clutter_stage_window_dirty_back_buffer (ClutterStageWindow *window)
{
ClutterStageWindowIface *iface;
g_return_if_fail (CLUTTER_IS_STAGE_WINDOW (window));
iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
if (iface->dirty_back_buffer)
iface->dirty_back_buffer (window);
}
/* NB: The presumption shouldn't be that a stage can't be comprised of /* NB: The presumption shouldn't be that a stage can't be comprised of
* multiple internal framebuffers, so instead of simply naming this * multiple internal framebuffers, so instead of simply naming this
* function _clutter_stage_window_get_framebuffer(), the "active" * function _clutter_stage_window_get_framebuffer(), the "active"

4
clutter/clutter/clutter-stage-window.h
View File

@ -76,8 +76,6 @@ struct _ClutterStageWindowIface
void (* redraw) (ClutterStageWindow *stage_window); void (* redraw) (ClutterStageWindow *stage_window);
void (* dirty_back_buffer) (ClutterStageWindow *stage_window);
void (* get_dirty_pixel) (ClutterStageWindow *stage_window, void (* get_dirty_pixel) (ClutterStageWindow *stage_window,
int *x, int *y); int *x, int *y);
@ -133,8 +131,6 @@ void _clutter_stage_window_set_accept_focus (ClutterStageWin
void _clutter_stage_window_redraw (ClutterStageWindow *window); void _clutter_stage_window_redraw (ClutterStageWindow *window);
void _clutter_stage_window_dirty_back_buffer (ClutterStageWindow *window);
void _clutter_stage_window_get_dirty_pixel (ClutterStageWindow *window, void _clutter_stage_window_get_dirty_pixel (ClutterStageWindow *window,
int *x, int *y); int *x, int *y);

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

@ -403,7 +403,7 @@ clutter_stage_cogl_get_redraw_clip_bounds (ClutterStageWindow *stage_window,
static inline gboolean static inline gboolean
valid_buffer_age (ClutterStageCogl *stage_cogl, int age) valid_buffer_age (ClutterStageCogl *stage_cogl, int age)
{ {
if (age <= 0 || stage_cogl->dirty_backbuffer) if (age <= 0)
return FALSE; return FALSE;
return age < MIN (stage_cogl->damage_index, DAMAGE_HISTORY_MAX); return age < MIN (stage_cogl->damage_index, DAMAGE_HISTORY_MAX);
@ -643,9 +643,6 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
/* reset the redraw clipping for the next paint... */ /* reset the redraw clipping for the next paint... */
stage_cogl->initialized_redraw_clip = FALSE; stage_cogl->initialized_redraw_clip = FALSE;
/* We have repaired the backbuffer */
stage_cogl->dirty_backbuffer = FALSE;
stage_cogl->frame_count++; stage_cogl->frame_count++;
} }
@ -657,14 +654,6 @@ clutter_stage_cogl_get_active_framebuffer (ClutterStageWindow *stage_window)
return COGL_FRAMEBUFFER (stage_cogl->onscreen); return COGL_FRAMEBUFFER (stage_cogl->onscreen);
} }
static void
clutter_stage_cogl_dirty_back_buffer (ClutterStageWindow *stage_window)
{
ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window);
stage_cogl->dirty_backbuffer = TRUE;
}
static void static void
clutter_stage_cogl_get_dirty_pixel (ClutterStageWindow *stage_window, clutter_stage_cogl_get_dirty_pixel (ClutterStageWindow *stage_window,
int *x, int *x,
@ -707,7 +696,6 @@ clutter_stage_window_iface_init (ClutterStageWindowIface *iface)
iface->get_redraw_clip_bounds = clutter_stage_cogl_get_redraw_clip_bounds; iface->get_redraw_clip_bounds = clutter_stage_cogl_get_redraw_clip_bounds;
iface->redraw = clutter_stage_cogl_redraw; iface->redraw = clutter_stage_cogl_redraw;
iface->get_active_framebuffer = clutter_stage_cogl_get_active_framebuffer; iface->get_active_framebuffer = clutter_stage_cogl_get_active_framebuffer;
iface->dirty_back_buffer = clutter_stage_cogl_dirty_back_buffer;
iface->get_dirty_pixel = clutter_stage_cogl_get_dirty_pixel; iface->get_dirty_pixel = clutter_stage_cogl_get_dirty_pixel;
} }

2
clutter/clutter/cogl/clutter-stage-cogl.h
View File

@ -63,8 +63,6 @@ struct _ClutterStageCogl
/* TRUE if the current paint cycle has a clipped redraw. In that /* TRUE if the current paint cycle has a clipped redraw. In that
case bounding_redraw_clip specifies the the bounds. */ case bounding_redraw_clip specifies the the bounds. */
guint using_clipped_redraw : 1; guint using_clipped_redraw : 1;
guint dirty_backbuffer : 1;
}; };
struct _ClutterStageCoglClass struct _ClutterStageCoglClass