[Xfce4-commits] [xfce/xfwm4] 01/01: compositor: Do not bind/unbind textures every time

[noreply at xfce.org]

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 f343d4af8d8c9db58585da42262072cc657d3960
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Wed May 8 11:48:25 2019 +0200

    compositor: Do not bind/unbind textures every time
    
    That should not be needed.
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/compositor.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 6e5bb15..94cd6e6 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1408,7 +1408,6 @@ enable_glx_texture (ScreenInfo *screen_info)
     glEnable(screen_info->texture_type);
 }
 
-
 static void
 disable_glx_texture (ScreenInfo *screen_info)
 {
@@ -1624,8 +1623,6 @@ redraw_glx_texture (ScreenInfo *screen_info, XserverRegion region)
 
     glPopMatrix();
 
-    disable_glx_texture (screen_info);
-
     TRACE ("releasing bind GLX pixmap 0x%lx to texture 0x%x",
            screen_info->glx_drawable, screen_info->rootTexture);
     glXReleaseTexImageEXT (myScreenGetXDisplay (screen_info),
@@ -2089,6 +2086,13 @@ paint_all (ScreenInfo *screen_info, XserverRegion region, gushort buffer)
     if (screen_info->rootPixmap[buffer] == None)
     {
         screen_info->rootPixmap[buffer] = create_root_pixmap (screen_info);
+#ifdef HAVE_EPOXY
+        if (screen_info->use_glx)
+        {
+            bind_glx_texture (screen_info,
+                              screen_info->rootPixmap[buffer]);
+        }
+#endif /* HAVE_EPOXY */
     }
 
     if (screen_info->rootBuffer[buffer] == None)
@@ -2294,8 +2298,6 @@ paint_all (ScreenInfo *screen_info, XserverRegion region, gushort buffer)
     {
         fence_sync_pixmap (screen_info,
                            screen_info->rootPixmap[buffer]);
-        bind_glx_texture (screen_info,
-                          screen_info->rootPixmap[buffer]);
         redraw_glx_texture (screen_info, region);
     }
     else

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.