From 30eca348495877a00c7a9153b4cf91995f95a73c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 15 Jun 2005 10:12:57 +0000 Subject: (to_raw_X) really prevent loading/unloading twice the same glx module on non NV cards --- perl-install/Xconfig/card.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index 363a0befd..91f93300f 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -69,10 +69,7 @@ sub to_raw_X { # This loads the NVIDIA GLX extension module. # IT IS IMPORTANT TO KEEP NAME AS FULL PATH TO libglx.so ELSE # IT WILL LOAD XFree86 glx module and the server will crash. - if ($card->{Driver2} ne 'nvidia') { - $raw_X->set_load_module("/usr/X11R6/$lib/modules/extensions/libglx.a", 1); - } - + $raw_X->set_load_module("/usr/X11R6/$lib/modules/extensions/libglx.so", $card->{DRI_GLX_SPECIAL}); $raw_X->remove_Section('DRI'); $raw_X->remove_load_module('v4l') if $card->{use_DRI_GLX} && $card->{Driver} eq 'r128'; -- cgit v1.2.1