Date: Tue, 23 Aug 2011 17:41:26 -0400 From: Jung-uk Kim <jkim@FreeBSD.org> To: gecko@freebsd.org Subject: [PATCH] Firefox 6.0 and Mesa Message-ID: <201108231741.27971.jkim@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
--Boundary-00=_H6BVOG8RmaHnjS/ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline After I upgraded Firefox to 6.0, I started getting very annoying messages like this: WARNING: Application calling GLX 1.3 function "glXCreatePixmap" when GLX 1.3 is not supported! This is an application bug! failed to create drawable I googled and found a bug was already filed and resolved by the upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=659932 http://hg.mozilla.org/mozilla-central/rev/39fd1683ee6f A patch adopted for Firefox 6.0 release is attached. This patch does not "fix" the problem but the above annoying error messages are gone. Cheers, Jung-uk Kim --Boundary-00=_H6BVOG8RmaHnjS/ Content-Type: text/plain; charset="iso-8859-1"; name="patch-bugzilla-659932" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-bugzilla-659932" --- toolkit/xre/glxtest.cpp.orig 2011-08-11 17:41:31.000000000 -0400 +++ toolkit/xre/glxtest.cpp 2011-08-23 15:09:48.000000000 -0400 @@ -114,6 +114,9 @@ typedef GLXFBConfig* (* PFNGLXQUERYEXTENSION) (Display *, int *, int *); PFNGLXQUERYEXTENSION glXQueryExtension = cast<PFNGLXQUERYEXTENSION>(dlsym(libgl, "glXQueryExtension")); + typedef GLXFBConfig* (* PFNGLXQUERYVERSION) (Display *, int *, int *); + PFNGLXQUERYVERSION glXQueryVersion = cast<PFNGLXQUERYVERSION>(dlsym(libgl, "glXQueryVersion")); + typedef GLXFBConfig* (* PFNGLXCHOOSEFBCONFIG) (Display *, int, const int *, int *); PFNGLXCHOOSEFBCONFIG glXChooseFBConfig = cast<PFNGLXCHOOSEFBCONFIG>(dlsym(libgl, "glXChooseFBConfig")); @@ -139,6 +142,7 @@ PFNGLGETSTRING glGetString = cast<PFNGLGETSTRING>(dlsym(libgl, "glGetString")); if (!glXQueryExtension || + !glXQueryVersion || !glXChooseFBConfig || !glXGetVisualFromFBConfig || !glXCreatePixmap || @@ -158,6 +162,14 @@ ///// Check that the GLX extension is present ///// if (!glXQueryExtension(dpy, NULL, NULL)) fatal_error("GLX extension missing"); + + ///// Check that the GLX version is >= 1.3, needed for glXCreatePixmap, bug 659932 ///// + int majorVersion, minorVersion; + if (!glXQueryVersion(dpy, &majorVersion, &minorVersion)) + fatal_error("Unable to query GLX version"); + + if (majorVersion < 1 || (majorVersion == 1 && minorVersion < 3)) + fatal_error("GLX version older than the required 1.3"); XSetErrorHandler(x_error_handler); --Boundary-00=_H6BVOG8RmaHnjS/--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108231741.27971.jkim>