diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2021-04-19 18:19:30 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2021-07-09 16:10:06 +0200 |
| commit | 44f705a5b6b4f79682c5e649eb718a193e01ec47 (patch) | |
| tree | 31c432ae8acedecc5c41e4a345880e4237793b56 /present | |
| parent | 86e645bcfaea63bc3f91e4ccbbc19569929b92c3 (diff) | |
present: Pass capabilities to present_vblank_create by value
Preparation for moving WNMD code to hw/xwayland. No functional change
intended.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Diffstat (limited to 'present')
| -rw-r--r-- | present/present_priv.h | 2 | ||||
| -rw-r--r-- | present/present_scmd.c | 2 | ||||
| -rw-r--r-- | present/present_vblank.c | 6 | ||||
| -rw-r--r-- | present/present_wnmd.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/present/present_priv.h b/present/present_priv.h index eb0c20fbb..c50462cef 100644 --- a/present/present_priv.h +++ b/present/present_priv.h @@ -467,7 +467,7 @@ present_vblank_create(WindowPtr window, SyncFence *wait_fence, SyncFence *idle_fence, uint32_t options, - const uint32_t *capabilities, + const uint32_t capabilities, present_notify_ptr notifies, int num_notifies, uint64_t target_msc, diff --git a/present/present_scmd.c b/present/present_scmd.c index c8c701d72..c55ae0990 100644 --- a/present/present_scmd.c +++ b/present/present_scmd.c @@ -736,7 +736,7 @@ present_scmd_pixmap(WindowPtr window, wait_fence, idle_fence, options, - screen_priv->info ? &screen_priv->info->capabilities : NULL, + screen_priv->info ? screen_priv->info->capabilities : 0, notifies, num_notifies, target_msc, diff --git a/present/present_vblank.c b/present/present_vblank.c index b46370982..6ab0d35f1 100644 --- a/present/present_vblank.c +++ b/present/present_vblank.c @@ -50,7 +50,7 @@ present_vblank_create(WindowPtr window, SyncFence *wait_fence, SyncFence *idle_fence, uint32_t options, - const uint32_t *capabilities, + const uint32_t capabilities, present_notify_ptr notifies, int num_notifies, uint64_t target_msc, @@ -111,13 +111,13 @@ present_vblank_create(WindowPtr window, if (pixmap != NULL && !(options & PresentOptionCopy) && - capabilities) { + screen_priv->check_flip) { if (msc_is_after(target_msc, crtc_msc) && screen_priv->check_flip (target_crtc, window, pixmap, TRUE, valid, x_off, y_off, &reason)) { vblank->flip = TRUE; vblank->sync_flip = TRUE; - } else if ((*capabilities & PresentCapabilityAsync) && + } else if ((capabilities & PresentCapabilityAsync) && screen_priv->check_flip (target_crtc, window, pixmap, FALSE, valid, x_off, y_off, &reason)) { vblank->flip = TRUE; diff --git a/present/present_wnmd.c b/present/present_wnmd.c index aed10dae3..9e70d83b3 100644 --- a/present/present_wnmd.c +++ b/present/present_wnmd.c @@ -623,7 +623,7 @@ present_wnmd_pixmap(WindowPtr window, wait_fence, idle_fence, options, - &screen_priv->wnmd_info->capabilities, + screen_priv->wnmd_info->capabilities, notifies, num_notifies, target_msc, |