aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/present/present_fake.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-21 08:45:16 +0100
committermarha <marha@users.sourceforge.net>2013-11-21 08:45:16 +0100
commit6e90a0e707aa6d28622f654078f25066bef4dc80 (patch)
treecc95d3e984b2fc4503b5fc8ae731518a8c34fe7c /xorg-server/present/present_fake.c
parentf75616ac3e99a6bb814803c823cb34533b9fc328 (diff)
parentbb953a87489963f63e65c797a1f2837382ff7808 (diff)
downloadvcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.tar.gz
vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.tar.bz2
vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver mesa git update 21 nov 2013
Diffstat (limited to 'xorg-server/present/present_fake.c')
-rw-r--r--xorg-server/present/present_fake.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/present/present_fake.c b/xorg-server/present/present_fake.c
index a67759254..e550e98f8 100644
--- a/xorg-server/present/present_fake.c
+++ b/xorg-server/present/present_fake.c
@@ -42,7 +42,7 @@ present_fake_get_ust_msc(ScreenPtr screen, uint64_t *ust, uint64_t *msc)
present_screen_priv_ptr screen_priv = present_screen_priv(screen);
*ust = GetTimeInMicros();
- *msc = *ust / screen_priv->fake_interval;
+ *msc = (*ust + screen_priv->fake_interval / 2) / screen_priv->fake_interval;
return Success;
}