[mutter] Work around Mesa problem with PFNGLACTIVETEXTUREPROC



commit 86f8c1863e080b961990ba88c5797248e86fcd32
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Mon Nov 30 10:49:12 2009 -0500

    Work around Mesa problem with PFNGLACTIVETEXTUREPROC
    
    PFNGLACTIVETEXTUREPROC (a GL-1.2 addition) was inadvertently missing
    from some recent versions of Mesa (like that in Fedora 11.) Use
    the identical PFNGLACTIVETEXTUREARBPROC instead.

 src/compositor/mutter-texture-tower.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/compositor/mutter-texture-tower.c b/src/compositor/mutter-texture-tower.c
index 36469a1..7146a89 100644
--- a/src/compositor/mutter-texture-tower.c
+++ b/src/compositor/mutter-texture-tower.c
@@ -32,7 +32,7 @@
 #endif
 
 #if !CLUTTER_CHECK_VERSION(1,1,3)
-static PFNGLACTIVETEXTUREPROC activeTexture;
+static PFNGLACTIVETEXTUREARBPROC activeTexture;
 static PFNGLGENFRAMEBUFFERSPROC genFramebuffers;
 static PFNGLDELETEFRAMEBUFFERSPROC deleteFramebuffers;
 static PFNGLBINDFRAMEBUFFERPROC bindFramebuffer;
@@ -489,7 +489,7 @@ initialize_gl_functions (void)
     {
       initialized = TRUE;
 
-      activeTexture = (PFNGLACTIVETEXTUREPROC) cogl_get_proc_address ("glActiveTextureARB");
+      activeTexture = (PFNGLACTIVETEXTUREARBPROC) cogl_get_proc_address ("glActiveTextureARB");
       genFramebuffers = (PFNGLGENFRAMEBUFFERSPROC) cogl_get_proc_address ("glGenFramebuffersEXT");
       deleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSPROC) cogl_get_proc_address ("glDeleteFramebuffersEXT");
       bindFramebuffer = (PFNGLBINDFRAMEBUFFERPROC) cogl_get_proc_address ("glBindFramebufferEXT");



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]