clutter/frame-clock: Merge states DISPATCHING and PENDING_PRESENTED
Chronologically they already overlap in time as presentation may complete in the middle of the dispatch function, otherwise they are contiguous in time. And most switch statements treated the two states the same already so they're easy to merge into a single `DISPATCHED` state. Having fewer states now will make life easier when we add more states later.
This commit is contained in:
parent
09fa9d14d9
commit
6cc1801e45
1 changed files with 11 additions and 20 deletions
|
@ -70,8 +70,7 @@ typedef enum _ClutterFrameClockState
|
|||
CLUTTER_FRAME_CLOCK_STATE_IDLE,
|
||||
CLUTTER_FRAME_CLOCK_STATE_SCHEDULED,
|
||||
CLUTTER_FRAME_CLOCK_STATE_SCHEDULED_NOW,
|
||||
CLUTTER_FRAME_CLOCK_STATE_DISPATCHING,
|
||||
CLUTTER_FRAME_CLOCK_STATE_PENDING_PRESENTED,
|
||||
CLUTTER_FRAME_CLOCK_STATE_DISPATCHED,
|
||||
} ClutterFrameClockState;
|
||||
|
||||
struct _ClutterFrameClock
|
||||
|
@ -418,8 +417,7 @@ clutter_frame_clock_notify_presented (ClutterFrameClock *frame_clock,
|
|||
case CLUTTER_FRAME_CLOCK_STATE_SCHEDULED_NOW:
|
||||
g_warn_if_reached ();
|
||||
break;
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHING:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_PENDING_PRESENTED:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHED:
|
||||
frame_clock->state = CLUTTER_FRAME_CLOCK_STATE_IDLE;
|
||||
maybe_reschedule_update (frame_clock);
|
||||
break;
|
||||
|
@ -440,8 +438,7 @@ clutter_frame_clock_notify_ready (ClutterFrameClock *frame_clock)
|
|||
case CLUTTER_FRAME_CLOCK_STATE_SCHEDULED_NOW:
|
||||
g_warn_if_reached ();
|
||||
break;
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHING:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_PENDING_PRESENTED:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHED:
|
||||
frame_clock->state = CLUTTER_FRAME_CLOCK_STATE_IDLE;
|
||||
maybe_reschedule_update (frame_clock);
|
||||
break;
|
||||
|
@ -741,8 +738,7 @@ clutter_frame_clock_inhibit (ClutterFrameClock *frame_clock)
|
|||
frame_clock->pending_reschedule_now = TRUE;
|
||||
frame_clock->state = CLUTTER_FRAME_CLOCK_STATE_IDLE;
|
||||
break;
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHING:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_PENDING_PRESENTED:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHED:
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -781,8 +777,7 @@ clutter_frame_clock_schedule_update_now (ClutterFrameClock *frame_clock)
|
|||
break;
|
||||
case CLUTTER_FRAME_CLOCK_STATE_SCHEDULED_NOW:
|
||||
return;
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHING:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_PENDING_PRESENTED:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHED:
|
||||
frame_clock->pending_reschedule = TRUE;
|
||||
frame_clock->pending_reschedule_now = TRUE;
|
||||
return;
|
||||
|
@ -837,8 +832,7 @@ clutter_frame_clock_schedule_update (ClutterFrameClock *frame_clock)
|
|||
case CLUTTER_FRAME_CLOCK_STATE_SCHEDULED:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_SCHEDULED_NOW:
|
||||
return;
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHING:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_PENDING_PRESENTED:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHED:
|
||||
frame_clock->pending_reschedule = TRUE;
|
||||
return;
|
||||
}
|
||||
|
@ -893,8 +887,7 @@ clutter_frame_clock_set_mode (ClutterFrameClock *frame_clock,
|
|||
frame_clock->pending_reschedule_now = TRUE;
|
||||
frame_clock->state = CLUTTER_FRAME_CLOCK_STATE_IDLE;
|
||||
break;
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHING:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_PENDING_PRESENTED:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHED:
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -954,7 +947,7 @@ clutter_frame_clock_dispatch (ClutterFrameClock *frame_clock,
|
|||
frame_clock->last_dispatch_time_us = time_us;
|
||||
g_source_set_ready_time (frame_clock->source, -1);
|
||||
|
||||
frame_clock->state = CLUTTER_FRAME_CLOCK_STATE_DISPATCHING;
|
||||
frame_clock->state = CLUTTER_FRAME_CLOCK_STATE_DISPATCHED;
|
||||
|
||||
frame_count = frame_clock->frame_count++;
|
||||
|
||||
|
@ -988,20 +981,20 @@ clutter_frame_clock_dispatch (ClutterFrameClock *frame_clock,
|
|||
switch (frame_clock->state)
|
||||
{
|
||||
case CLUTTER_FRAME_CLOCK_STATE_INIT:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_PENDING_PRESENTED:
|
||||
g_warn_if_reached ();
|
||||
break;
|
||||
case CLUTTER_FRAME_CLOCK_STATE_IDLE:
|
||||
/* Presentation completed synchronously in the above listener */
|
||||
case CLUTTER_FRAME_CLOCK_STATE_SCHEDULED:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_SCHEDULED_NOW:
|
||||
break;
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHING:
|
||||
case CLUTTER_FRAME_CLOCK_STATE_DISPATCHED:
|
||||
switch (result)
|
||||
{
|
||||
case CLUTTER_FRAME_RESULT_PENDING_PRESENTED:
|
||||
frame_clock->state = CLUTTER_FRAME_CLOCK_STATE_PENDING_PRESENTED;
|
||||
break;
|
||||
case CLUTTER_FRAME_RESULT_IDLE:
|
||||
/* The frame was aborted; nothing to paint/present */
|
||||
frame_clock->state = CLUTTER_FRAME_CLOCK_STATE_IDLE;
|
||||
maybe_reschedule_update (frame_clock);
|
||||
break;
|
||||
|
@ -1218,8 +1211,6 @@ clutter_frame_clock_dispose (GObject *object)
|
|||
{
|
||||
ClutterFrameClock *frame_clock = CLUTTER_FRAME_CLOCK (object);
|
||||
|
||||
g_warn_if_fail (frame_clock->state != CLUTTER_FRAME_CLOCK_STATE_DISPATCHING);
|
||||
|
||||
if (frame_clock->source)
|
||||
{
|
||||
g_signal_emit (frame_clock, signals[DESTROY], 0);
|
||||
|
|
Loading…
Reference in a new issue