frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Xaver Hugl 2022-10-17 16:31:05 +02:00
parent c6bf0e3950
commit 2adc5c45c1
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -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'

2
meson.build
View File

@ -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,

2
present/present.c
View File

@ -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

2
present/present_vblank.c
View File

@ -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;