Date: Mon, 21 Feb 2005 22:55:56 +0100 From: Felix =?ISO-8859-1?Q?K=FChling?= <fxkuehl@gmx.de> To: "Mikhail T." <mi@aldan.algebra.com> Cc: acardenas@bsdperu.org Subject: Re: ports/76257: nvidia_driver breaks xorg-clients build Message-ID: <1109022957.3355.15.camel@trabant> In-Reply-To: <200502211151.05030@Misha> References: <200502210153.59048@aldan> <1108985730.3418.21.camel@trabant> <200502211151.05030@Misha>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Could you try if the attached patch against xdriinfo.c works with NVidia's GLX? If it does, then I'll commit this to Xorg CVS. Regards, Felix Am Montag, den 21.02.2005, 11:51 -0500 schrieb Mikhail T.: [snip] -- | Felix Kühling <fxkuehl@gmx.de> http://fxk.de.vu | | PGP Fingerprint: 6A3C 9566 5B30 DDED 73C3 B152 151C 5CC1 D888 E595 | [-- Attachment #2 --] --- ./xdriinfo.c.~1.1.3.1.~ 2004-06-16 11:27:39.000000000 +0200 +++ ./xdriinfo.c 2005-02-21 22:50:37.000000000 +0100 @@ -28,6 +28,14 @@ #include <unistd.h> #include <string.h> +#ifdef GLX_VERSION_1_4 +# define GLX_GET_PROC_ADDRESS(name) \ + glXGetProcAddress((const GLubyte *)(name)) +#else +# define GLX_GET_PROC_ADDRESS(name) \ + glXGetProcAddressARB((const GLubyte *)(name)) +#endif + typedef const char * glXGetScreenDriver_t (Display *dpy, int scrNum); typedef const char * glXGetDriverConfig_t (const char *driverName); @@ -57,10 +65,13 @@ char *funcArg = NULL; char *dpyName = NULL; - GetScreenDriver = (glXGetScreenDriver_t *)glXGetProcAddress ("glXGetScreenDriver"); - GetDriverConfig = (glXGetDriverConfig_t *)glXGetProcAddress ("glXGetDriverConfig"); + GetScreenDriver = (glXGetScreenDriver_t *) + GLX_GET_PROC_ADDRESS ("glXGetScreenDriver"); + GetDriverConfig = (glXGetDriverConfig_t *) + GLX_GET_PROC_ADDRESS ("glXGetDriverConfig"); if (!GetScreenDriver || !GetDriverConfig) { - fprintf (stderr, "libGL is too old.\n"); + fprintf (stderr, "libGL does not support the " + "DRI configuration infrastructure.\n"); return 1; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1109022957.3355.15.camel>