diff options
| author | Xaver Hugl <xaver.hugl@gmail.com> | 2022-10-17 16:31:05 +0200 |
|---|---|---|
| committer | Xaver Hugl <xaver.hugl@gmail.com> | 2023-06-19 12:19:31 +0200 |
| commit | 2adc5c45c1126fc26fb757ddf5b9df5fd0d907eb (patch) | |
| tree | 83766c3d8a0a06cbf4c56c1cc0ac210b9c2bd987 | |
| parent | c6bf0e3950592b4b7c0ed53f5bd48ffa0fc54dff (diff) | |
present: add support for PresentOptionAsyncMayTear
Signed-off-by: Xaver Hugl <xaver.hugl@gmail.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | present/present.c | 2 | ||||
| -rw-r--r-- | present/present_vblank.c | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 701963d00..974346aee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: FDO_UPSTREAM_REPO: xorg/xserver FDO_DISTRIBUTION_VERSION: bullseye-slim FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' - FDO_DISTRIBUTION_TAG: "2023-06-13-new-xorg-proto" + FDO_DISTRIBUTION_TAG: "2023-06-18-xorgproto-2023.2" include: - project: 'freedesktop/ci-templates' diff --git a/meson.build b/meson.build index ee308cdcc..ca0ad94ef 100644 --- a/meson.build +++ b/meson.build @@ -79,6 +79,7 @@ fixesproto_dep = dependency('fixesproto', version: '>= 6.0', fallback: ['xorgpro damageproto_dep = dependency('damageproto', version: '>= 1.1', fallback: ['xorgproto', 'ext_xorgproto']) xcmiscproto_dep = dependency('xcmiscproto', version: '>= 1.2.0', fallback: ['xorgproto', 'ext_xorgproto']) bigreqsproto_dep = dependency('bigreqsproto', version: '>= 1.1.0', fallback: ['xorgproto', 'ext_xorgproto']) +presentproto_dep = dependency('presentproto', version: '>= 1.3', fallback: ['xorgproto', 'ext_xorgproto']) xtrans_dep = dependency('xtrans', version: '>= 1.3.5') videoproto_dep = dependency('videoproto', fallback: ['xorgproto', 'ext_xorgproto']) @@ -602,6 +603,7 @@ common_dep = [ damageproto_dep, xcmiscproto_dep, bigreqsproto_dep, + presentproto_dep, xtrans_dep, libsystemd_daemon_dep, diff --git a/present/present.c b/present/present.c index 271fe32bc..211868341 100644 --- a/present/present.c +++ b/present/present.c @@ -157,7 +157,7 @@ present_get_target_msc(uint64_t target_msc_arg, uint64_t remainder, uint32_t options) { - const Bool synced_flip = !(options & PresentOptionAsync); + const Bool synced_flip = !(options & PresentAllAsyncOptions); uint64_t target_msc; /* If the specified target-msc lies in the future, then this diff --git a/present/present_vblank.c b/present/present_vblank.c index a9f17d4b2..4f94f16e4 100644 --- a/present/present_vblank.c +++ b/present/present_vblank.c @@ -115,7 +115,7 @@ present_vblank_init(present_vblank_ptr vblank, { vblank->flip = TRUE; vblank->sync_flip = TRUE; - } else if ((capabilities & PresentCapabilityAsync) && + } else if ((capabilities & PresentAllAsyncCapabilities) && screen_priv->check_flip (target_crtc, window, pixmap, FALSE, valid, x_off, y_off, &reason)) { vblank->flip = TRUE; |