summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-06-15 10:12:57 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-06-15 10:12:57 +0000
commit30eca348495877a00c7a9153b4cf91995f95a73c (patch)
tree88c05a4d5f6b6b041abb1e038fccdf9aa58d47e0
parent69393b7b88500cc14b8b144088f3c7823c0b5b94 (diff)
downloaddrakx-30eca348495877a00c7a9153b4cf91995f95a73c.tar
drakx-30eca348495877a00c7a9153b4cf91995f95a73c.tar.gz
drakx-30eca348495877a00c7a9153b4cf91995f95a73c.tar.bz2
drakx-30eca348495877a00c7a9153b4cf91995f95a73c.tar.xz
drakx-30eca348495877a00c7a9153b4cf91995f95a73c.zip
(to_raw_X) really prevent loading/unloading twice the same glx module on non NV cards
-rw-r--r--perl-install/Xconfig/card.pm5
1 files changed, 1 insertions, 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';