From 40caa24d4b475a441f0dae8218e836174312e115 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Tue, 18 Jan 2022 14:43:24 -0600 Subject: [PATCH] c/main: Rename to calc_frame_pacing --- src/xrt/compositor/main/comp_compositor.c | 2 +- src/xrt/compositor/main/comp_target.h | 28 +++++++++---------- .../compositor/main/comp_target_swapchain.c | 14 +++++----- .../compositor/main/comp_target_swapchain.h | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/xrt/compositor/main/comp_compositor.c b/src/xrt/compositor/main/comp_compositor.c index 41fe722c1..45003dbe5 100644 --- a/src/xrt/compositor/main/comp_compositor.c +++ b/src/xrt/compositor/main/comp_compositor.c @@ -152,7 +152,7 @@ compositor_predict_frame(struct xrt_compositor *xc, uint64_t present_slop_ns = 0; uint64_t desired_present_time_ns = 0; uint64_t predicted_display_time_ns = 0; - comp_target_calc_frame_timings( // + comp_target_calc_frame_pacing( // c->target, // &frame_id, // &wake_up_time_ns, // diff --git a/src/xrt/compositor/main/comp_target.h b/src/xrt/compositor/main/comp_target.h index 41a459066..e0f69d0ab 100644 --- a/src/xrt/compositor/main/comp_target.h +++ b/src/xrt/compositor/main/comp_target.h @@ -169,12 +169,12 @@ struct comp_target * Predict when the next frame should be started and when it will be * turned into photons by the hardware. */ - void (*calc_frame_timings)(struct comp_target *ct, - int64_t *out_frame_id, - uint64_t *out_wake_up_time_ns, - uint64_t *out_desired_present_time_ns, - uint64_t *out_present_slop_ns, - uint64_t *out_predicted_display_time_ns); + void (*calc_frame_pacing)(struct comp_target *ct, + int64_t *out_frame_id, + uint64_t *out_wake_up_time_ns, + uint64_t *out_desired_present_time_ns, + uint64_t *out_present_slop_ns, + uint64_t *out_predicted_display_time_ns); /*! * 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 * @ingroup comp_main */ static inline void -comp_target_calc_frame_timings(struct comp_target *ct, - int64_t *out_frame_id, - uint64_t *out_wake_up_time_ns, - uint64_t *out_desired_present_time_ns, - uint64_t *out_present_slop_ns, - uint64_t *out_predicted_display_time_ns) +comp_target_calc_frame_pacing(struct comp_target *ct, + int64_t *out_frame_id, + uint64_t *out_wake_up_time_ns, + uint64_t *out_desired_present_time_ns, + uint64_t *out_present_slop_ns, + uint64_t *out_predicted_display_time_ns) { COMP_TRACE_MARKER(); - ct->calc_frame_timings( // + ct->calc_frame_pacing( // ct, // out_frame_id, // out_wake_up_time_ns, // diff --git a/src/xrt/compositor/main/comp_target_swapchain.c b/src/xrt/compositor/main/comp_target_swapchain.c index 80085c2ca..23e0d0703 100644 --- a/src/xrt/compositor/main/comp_target_swapchain.c +++ b/src/xrt/compositor/main/comp_target_swapchain.c @@ -582,12 +582,12 @@ comp_target_swapchain_create_image_views(struct comp_target_swapchain *cts) */ static void -comp_target_swapchain_calc_frame_timings(struct comp_target *ct, - int64_t *out_frame_id, - uint64_t *out_wake_up_time_ns, - uint64_t *out_desired_present_time_ns, - uint64_t *out_present_slop_ns, - uint64_t *out_predicted_display_time_ns) +comp_target_swapchain_calc_frame_pacing(struct comp_target *ct, + int64_t *out_frame_id, + uint64_t *out_wake_up_time_ns, + uint64_t *out_desired_present_time_ns, + uint64_t *out_present_slop_ns, + uint64_t *out_predicted_display_time_ns) { 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.acquire = comp_target_swapchain_acquire_next_image; 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.update_timings = comp_target_swapchain_update_timings; } diff --git a/src/xrt/compositor/main/comp_target_swapchain.h b/src/xrt/compositor/main/comp_target_swapchain.h index 2cd673c2c..b6ab137d5 100644 --- a/src/xrt/compositor/main/comp_target_swapchain.h +++ b/src/xrt/compositor/main/comp_target_swapchain.h @@ -94,7 +94,7 @@ struct comp_target_swapchain * - comp_target::has_images * - comp_target::acquire * - comp_target::present - * - comp_target::calc_frame_timings + * - comp_target::calc_frame_pacing * - comp_target::mark_timing_point * - comp_target::update_timings *