isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl/frame-info: Add HW_CLOCK flag

Browse Source 
A flag indicating whether the presentation timestamp was provided by the
display hardware (rather than sampled in user space).

It will be used for the presentation-time Wayland protocol.

This is definitely the case for page_flip_handler(), and I'm assuming
this is also the case for the two instances in the GLX code.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1484>
This commit is contained in:
Ivan Molodetskikh 2021-01-28 10:03:18 +03:00 committed by Marge Bot
parent d54dc1ae7c
commit 9d54ef3994
5 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl/cogl-frame-info-private.h
View File

@ -38,6 +38,8 @@ typedef enum _CoglFrameInfoFlag
{ {
COGL_FRAME_INFO_FLAG_NONE = 0, COGL_FRAME_INFO_FLAG_NONE = 0,
COGL_FRAME_INFO_FLAG_SYMBOLIC = 1 << 0, COGL_FRAME_INFO_FLAG_SYMBOLIC = 1 << 0,
/* presentation_time timestamp was provided by the hardware */
COGL_FRAME_INFO_FLAG_HW_CLOCK = 1 << 1,
} CoglFrameInfoFlag; } CoglFrameInfoFlag;
struct _CoglFrameInfo struct _CoglFrameInfo

6
cogl/cogl/cogl-frame-info.c
View File

@ -88,3 +88,9 @@ cogl_frame_info_get_is_symbolic (CoglFrameInfo *info)
{ {
return !!(info->flags & COGL_FRAME_INFO_FLAG_SYMBOLIC); return !!(info->flags & COGL_FRAME_INFO_FLAG_SYMBOLIC);
} }
gboolean
cogl_frame_info_is_hw_clock (CoglFrameInfo *info)
{
return !!(info->flags & COGL_FRAME_INFO_FLAG_HW_CLOCK);
}

3
cogl/cogl/cogl-frame-info.h
View File

@ -140,6 +140,9 @@ int64_t cogl_frame_info_get_global_frame_counter (CoglFrameInfo *info);
COGL_EXPORT COGL_EXPORT
gboolean cogl_frame_info_get_is_symbolic (CoglFrameInfo *info); gboolean cogl_frame_info_get_is_symbolic (CoglFrameInfo *info);
COGL_EXPORT
gboolean cogl_frame_info_is_hw_clock (CoglFrameInfo *info);
G_END_DECLS G_END_DECLS
#endif /* __COGL_FRAME_INFO_H */ #endif /* __COGL_FRAME_INFO_H */

2
cogl/cogl/winsys/cogl-onscreen-glx.c
View File

@ -485,6 +485,7 @@ _cogl_winsys_wait_for_vblank (CoglOnscreen *onscreen)
info->presentation_time = ust_to_nanoseconds (ctx->display->renderer, info->presentation_time = ust_to_nanoseconds (ctx->display->renderer,
drawable, drawable,
ust); ust);
info->flags |= COGL_FRAME_INFO_FLAG_HW_CLOCK;
} }
else else
{ {
@ -978,6 +979,7 @@ cogl_onscreen_glx_notify_swap_buffers (CoglOnscreen *onscreen,
ust_to_nanoseconds (context->display->renderer, ust_to_nanoseconds (context->display->renderer,
onscreen_glx->glxwin, onscreen_glx->glxwin,
swap_event->ust); swap_event->ust);
info->flags |= COGL_FRAME_INFO_FLAG_HW_CLOCK;
} }
set_complete_pending (onscreen); set_complete_pending (onscreen);

20
src/backends/native/meta-onscreen-native.c
View File

@ -167,9 +167,10 @@ meta_onscreen_native_swap_drm_fb (CoglOnscreen *onscreen)
} }
static void static void
maybe_update_frame_info (MetaCrtc *crtc, maybe_update_frame_info (MetaCrtc *crtc,
CoglFrameInfo *frame_info, CoglFrameInfo *frame_info,
int64_t time_ns) int64_t time_ns,
CoglFrameInfoFlag flags)
{ {
const MetaCrtcConfig *crtc_config; const MetaCrtcConfig *crtc_config;
const MetaCrtcModeInfo *crtc_mode_info; const MetaCrtcModeInfo *crtc_mode_info;
@ -187,6 +188,7 @@ maybe_update_frame_info (MetaCrtc *crtc,
{ {
frame_info->presentation_time = time_ns; frame_info->presentation_time = time_ns;
frame_info->refresh_rate = refresh_rate; frame_info->refresh_rate = refresh_rate;
frame_info->flags |= flags;
} }
} }
@ -207,7 +209,8 @@ meta_onscreen_native_notify_frame_complete (CoglOnscreen *onscreen)
static void static void
notify_view_crtc_presented (MetaRendererView *view, notify_view_crtc_presented (MetaRendererView *view,
MetaKmsCrtc *kms_crtc, MetaKmsCrtc *kms_crtc,
int64_t time_ns) int64_t time_ns,
CoglFrameInfoFlag flags)
{ {
ClutterStageView *stage_view = CLUTTER_STAGE_VIEW (view); ClutterStageView *stage_view = CLUTTER_STAGE_VIEW (view);
CoglFramebuffer *framebuffer = CoglFramebuffer *framebuffer =
@ -222,7 +225,7 @@ notify_view_crtc_presented (MetaRendererView *view,
frame_info = cogl_onscreen_peek_head_frame_info (onscreen); frame_info = cogl_onscreen_peek_head_frame_info (onscreen);
crtc = META_CRTC (meta_crtc_kms_from_kms_crtc (kms_crtc)); crtc = META_CRTC (meta_crtc_kms_from_kms_crtc (kms_crtc));
maybe_update_frame_info (crtc, frame_info, time_ns); maybe_update_frame_info (crtc, frame_info, time_ns, flags);
meta_onscreen_native_notify_frame_complete (onscreen); meta_onscreen_native_notify_frame_complete (onscreen);
@ -266,7 +269,8 @@ page_flip_feedback_flipped (MetaKmsCrtc *kms_crtc,
}; };
notify_view_crtc_presented (view, kms_crtc, notify_view_crtc_presented (view, kms_crtc,
timeval_to_nanoseconds (&page_flip_time)); timeval_to_nanoseconds (&page_flip_time),
COGL_FRAME_INFO_FLAG_HW_CLOCK);
} }
static void static void
@ -303,7 +307,7 @@ page_flip_feedback_mode_set_fallback (MetaKmsCrtc *kms_crtc,
gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc)); gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc));
now_ns = meta_gpu_kms_get_current_time_ns (gpu_kms); now_ns = meta_gpu_kms_get_current_time_ns (gpu_kms);
notify_view_crtc_presented (view, kms_crtc, now_ns); notify_view_crtc_presented (view, kms_crtc, now_ns, COGL_FRAME_INFO_FLAG_NONE);
} }
static void static void
@ -331,7 +335,7 @@ page_flip_feedback_discarded (MetaKmsCrtc *kms_crtc,
gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc)); gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc));
now_ns = meta_gpu_kms_get_current_time_ns (gpu_kms); now_ns = meta_gpu_kms_get_current_time_ns (gpu_kms);
notify_view_crtc_presented (view, kms_crtc, now_ns); notify_view_crtc_presented (view, kms_crtc, now_ns, COGL_FRAME_INFO_FLAG_NONE);
} }
static const MetaKmsPageFlipListenerVtable page_flip_listener_vtable = { static const MetaKmsPageFlipListenerVtable page_flip_listener_vtable = {