This is an automated email from the git hooks/post-receive script.
o l i v i e r p u s h e d a
c o m m i t t o b r a n c h
m a s t e r
in repository xfce/xfwm4.
commit 5ee90cf17c156fd65a79801ceecafb2b2282dea1
Author: Olivier Fourdan <four...@xfce.org>
Date: Tue Dec 5 10:53:11 2017 +0100
compositor: check XPresent before GLX
Bug: 13970
Not that it matters much in this case though.
Signed-off-by: Olivier Fourdan <four...@xfce.org>
---
src/compositor.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/compositor.c b/src/compositor.c
index 922afee..eaa4d66 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -2161,18 +2161,8 @@ paint_all (ScreenInfo *screen_info, XserverRegion
region, gushort buffer)
}
}
-#ifdef HAVE_EPOXY
- if (screen_info->use_glx) /* glx first if available */
- {
- glXWaitX ();
- bind_glx_texture (screen_info,
- screen_info->rootPixmap[buffer]);
- redraw_glx_texture (screen_info);
- }
- else
-#endif /* HAVE_EPOXY */
#ifdef HAVE_PRESENT_EXTENSION
- if (screen_info->use_present) /* otherwise present if available */
+ if (screen_info->use_present)
{
if (screen_info->zoomed)
{
@@ -2187,6 +2177,16 @@ paint_all (ScreenInfo *screen_info, XserverRegion
region, gushort buffer)
}
else
#endif /* HAVE_PRESENT_EXTENSION */
+#ifdef HAVE_EPOXY
+ if (screen_info->use_glx)
+ {
+ glXWaitX ();
+ bind_glx_texture (screen_info,
+ screen_info->rootPixmap[buffer]);
+ redraw_glx_texture (screen_info);
+ }
+ else
+#endif /* HAVE_EPOXY */
{
if (screen_info->zoomed)
{
@@ -4339,13 +4339,13 @@ compositorManageScreen (ScreenInfo *screen_info)
screen_info->use_glx = FALSE;
#endif /* HAVE_EPOXY */
- if (screen_info->use_glx)
+ if (screen_info->use_present)
{
- DBG ("Compositor using GLX for vsync");
+ DBG ("Compositor using XPresent for vsync");
}
- else if (screen_info->use_present)
+ else if (screen_info->use_glx)
{
- DBG ("Compositor using XPresent for vsync");
+ DBG ("Compositor using GLX for vsync");
}
else
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
