[Xfce4-commits] [xfce/xfwm4] 01/01: compositor/glx: Use actual texture type

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfwm4.

commit 14c204d90f66c56c5ae1c6ce52a3ff5f0c281001
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Fri Apr 24 23:12:26 2015 +0200

    compositor/glx: Use actual texture type
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/compositor.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 4e1b100..aef80b5 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1345,7 +1345,7 @@ unbind_glx_texture (ScreenInfo *screen_info)
 
     if (screen_info->rootTexture)
     {
-        glBindTexture (GL_TEXTURE_2D, None);
+        glBindTexture (screen_info->texture_type, None);
         glDeleteTextures (1, &screen_info->rootTexture);
         screen_info->rootTexture = None;
     }
@@ -1364,12 +1364,12 @@ bind_glx_texture (ScreenInfo *screen_info, Pixmap pixmap)
         glGenTextures(1, &screen_info->rootTexture);
     }
 
-    glBindTexture (GL_TEXTURE_2D, screen_info->rootTexture);
+    glBindTexture (screen_info->texture_type, screen_info->rootTexture);
 
     if (screen_info->glx_drawable == None)
     {
         screen_info->glx_drawable = create_glx_drawable (screen_info, pixmap);
-        glEnable(GL_TEXTURE_2D);
+        glEnable(screen_info->texture_type);
     }
     else
     {
@@ -1380,8 +1380,12 @@ bind_glx_texture (ScreenInfo *screen_info, Pixmap pixmap)
     glXBindTexImageEXT (myScreenGetXDisplay (screen_info),
                         screen_info->glx_drawable, GLX_FRONT_EXT, NULL);
 
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, screen_info->texture_filter);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, screen_info->texture_filter);
+    glTexParameterf(screen_info->texture_type,
+                    GL_TEXTURE_MIN_FILTER,
+                    screen_info->texture_filter);
+    glTexParameterf(screen_info->texture_type,
+                    GL_TEXTURE_MAG_FILTER,
+                    screen_info->texture_filter);
 }
 
 static void

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