From 86f8c1863e080b961990ba88c5797248e86fcd32 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Mon, 30 Nov 2009 10:49:12 -0500 Subject: [PATCH] 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 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compositor/mutter-texture-tower.c b/src/compositor/mutter-texture-tower.c index 36469a150..7146a89dc 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");