mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-01 12:46:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

c/main: Rename to calc_frame_pacing

Browse source
This commit is contained in:
Ryan Pavlik 2022-01-18 14:43:24 -06:00
parent d969bc334f
commit 40caa24d4b
4 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/xrt/compositor/main/comp_compositor.c
View file

@ -152,7 +152,7 @@ compositor_predict_frame(struct xrt_compositor *xc,
uint64_t present_slop_ns = 0; uint64_t present_slop_ns = 0;
uint64_t desired_present_time_ns = 0; uint64_t desired_present_time_ns = 0;
uint64_t predicted_display_time_ns = 0; uint64_t predicted_display_time_ns = 0;
comp_target_calc_frame_timings( // comp_target_calc_frame_pacing( //
c->target, // c->target, //
&frame_id, // &frame_id, //
&wake_up_time_ns, // &wake_up_time_ns, //

28
src/xrt/compositor/main/comp_target.h
View file

@ -169,12 +169,12 @@ struct comp_target
* Predict when the next frame should be started and when it will be * Predict when the next frame should be started and when it will be
* turned into photons by the hardware. * turned into photons by the hardware.
*/ */
void (*calc_frame_timings)(struct comp_target *ct, void (*calc_frame_pacing)(struct comp_target *ct,
int64_t *out_frame_id, int64_t *out_frame_id,
uint64_t *out_wake_up_time_ns, uint64_t *out_wake_up_time_ns,
uint64_t *out_desired_present_time_ns, uint64_t *out_desired_present_time_ns,
uint64_t *out_present_slop_ns, uint64_t *out_present_slop_ns,
uint64_t *out_predicted_display_time_ns); uint64_t *out_predicted_display_time_ns);
/*! /*!
* The compositor tells the target a timing information about a single * The compositor tells the target a timing information about a single
@ -348,22 +348,22 @@ comp_target_flush(struct comp_target *ct)
} }
/*! /*!
* @copydoc comp_target::calc_frame_timings * @copydoc comp_target::calc_frame_pacing
* *
* @public @memberof comp_target * @public @memberof comp_target
* @ingroup comp_main * @ingroup comp_main
*/ */
static inline void static inline void
comp_target_calc_frame_timings(struct comp_target *ct, comp_target_calc_frame_pacing(struct comp_target *ct,
int64_t *out_frame_id, int64_t *out_frame_id,
uint64_t *out_wake_up_time_ns, uint64_t *out_wake_up_time_ns,
uint64_t *out_desired_present_time_ns, uint64_t *out_desired_present_time_ns,
uint64_t *out_present_slop_ns, uint64_t *out_present_slop_ns,
uint64_t *out_predicted_display_time_ns) uint64_t *out_predicted_display_time_ns)
{ {
COMP_TRACE_MARKER(); COMP_TRACE_MARKER();
ct->calc_frame_timings( // ct->calc_frame_pacing( //
ct, // ct, //
out_frame_id, // out_frame_id, //
out_wake_up_time_ns, // out_wake_up_time_ns, //

14
src/xrt/compositor/main/comp_target_swapchain.c
View file

@ -582,12 +582,12 @@ comp_target_swapchain_create_image_views(struct comp_target_swapchain *cts)
*/ */
static void static void
comp_target_swapchain_calc_frame_timings(struct comp_target *ct, comp_target_swapchain_calc_frame_pacing(struct comp_target *ct,
int64_t *out_frame_id, int64_t *out_frame_id,
uint64_t *out_wake_up_time_ns, uint64_t *out_wake_up_time_ns,
uint64_t *out_desired_present_time_ns, uint64_t *out_desired_present_time_ns,
uint64_t *out_present_slop_ns, uint64_t *out_present_slop_ns,
uint64_t *out_predicted_display_time_ns) uint64_t *out_predicted_display_time_ns)
{ {
struct comp_target_swapchain *cts = (struct comp_target_swapchain *)ct; struct comp_target_swapchain *cts = (struct comp_target_swapchain *)ct;
@ -726,7 +726,7 @@ comp_target_swapchain_init_and_set_fnptrs(struct comp_target_swapchain *cts,
cts->base.has_images = comp_target_swapchain_has_images; cts->base.has_images = comp_target_swapchain_has_images;
cts->base.acquire = comp_target_swapchain_acquire_next_image; cts->base.acquire = comp_target_swapchain_acquire_next_image;
cts->base.present = comp_target_swapchain_present; cts->base.present = comp_target_swapchain_present;
cts->base.calc_frame_timings = comp_target_swapchain_calc_frame_timings; cts->base.calc_frame_pacing = comp_target_swapchain_calc_frame_pacing;
cts->base.mark_timing_point = comp_target_swapchain_mark_timing_point; cts->base.mark_timing_point = comp_target_swapchain_mark_timing_point;
cts->base.update_timings = comp_target_swapchain_update_timings; cts->base.update_timings = comp_target_swapchain_update_timings;
} }

2
src/xrt/compositor/main/comp_target_swapchain.h
View file

@ -94,7 +94,7 @@ struct comp_target_swapchain
* - comp_target::has_images * - comp_target::has_images
* - comp_target::acquire * - comp_target::acquire
* - comp_target::present * - comp_target::present
* - comp_target::calc_frame_timings * - comp_target::calc_frame_pacing
* - comp_target::mark_timing_point * - comp_target::mark_timing_point
* - comp_target::update_timings * - comp_target::update_timings
* *