diff options
Diffstat (limited to 'lib/Xconfig')
| -rw-r--r-- | lib/Xconfig/glx.pm | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/lib/Xconfig/glx.pm b/lib/Xconfig/glx.pm index 786a0d1..ceb5bd3 100644 --- a/lib/Xconfig/glx.pm +++ b/lib/Xconfig/glx.pm @@ -17,7 +17,7 @@ our @gl_compositing_types = ( { type => "cube", name => N_("Compiz Fusion"), - methods => [ qw(native Xgl) ], + methods => [ qw(native) ], wms => [ qw(compiz-fusion) ], }, { @@ -36,12 +36,6 @@ our @gl_compositing_servers = ( description => N_("Some drivers provide native support for OpenGL compositing (using AIGLX for example). If your system supports it, it is the preferred solution."), }, { - method => "Xgl", - name => "Xgl", - packages => [ 'x11-server-xgl' ], - description => N_("Xgl is an additional graphical server that adds 3D desktop support."), - }, - { method => "Xmetisse", name => "Metisse (experimental)", packages => [ 'x11-server-xmetisse' ], @@ -139,30 +133,12 @@ sub get_glx_status { $glx_status->{context}{Mesa} = $system_glx_info->{strings}{OpenGL_renderer} =~ /Mesa/; $glx_status->{context}{SoftwareRasterizer} = $system_glx_info->{strings}{OpenGL_renderer} =~ /Software Rasterizer/; $glx_status->{context}{MesaDRI} = $system_glx_info->{strings}{OpenGL_renderer} =~ /Mesa DRI/; - $glx_status->{context}{Xgl} = - $system_glx_info->{strings}{server_glx_vendor} eq 'SGI' && - member('GLX_EXT_texture_from_pixmap', @{$mesa_glx_info->{extensions}{GLX}}) && ( - #- avoid nv, but detect i810 and fglrx - member('GL_ARB_fragment_program', @{$mesa_glx_info->{extensions}{OpenGL}}) || - !$glx_status->{context}{Mesa} && member('GLX_SGIX_fbconfig', @{$system_glx_info->{extensions}{GLX}}) - ); $glx_status->{context}{Xmetisse} = is_in_metisse(); $glx_status->{capabilities}{direct_rendering} = ($system_glx_info->{capabilities}{direct_rendering} && !$glx_status->{context}{SoftwareRasterizer}) || - $glx_status->{context}{Xgl} || $glx_status->{context}{Xmetisse}; - $glx_status->{capabilities}{Xgl} = - $glx_status->{context}{Xgl} || - $glx_status->{capabilities}{direct_rendering} && ( - !$glx_status->{context}{MesaDRI} || - member('GLX_MESA_allocate_memory', @{$system_glx_info->{extensions}{GLX}}) - ) && ( - #- Xgl turns black with i810 and 16 bits - !member($driver, 'i810', 'intel') || $resolution->{Depth} eq '24' - ); - $glx_status->{capabilities}{native} = $glx_status->{capabilities}{direct_rendering} && member('GLX_EXT_texture_from_pixmap', @{$system_glx_info->{extensions}{client_glx}}) && @@ -187,8 +163,6 @@ sub detect() { $glx->{compositing} ? ( $glx->{capabilities}{native} && member($compositing_server->{COMPOSITING_SERVER_START}, qw(auto no)) && !$compositing_server->{COMPOSITING_SERVER} ? 'native' : - $glx->{capabilities}{Xgl} && member($compositing_server->{COMPOSITING_SERVER_START}, qw(auto yes)) && $compositing_server->{COMPOSITING_SERVER} eq 'Xgl' ? - 'Xgl' : $glx->{capabilities}{Xmetisse} && member($compositing_server->{COMPOSITING_SERVER_START}, qw(auto yes)) && $compositing_server->{COMPOSITING_SERVER} eq 'Xmetisse' ? 'Xmetisse' : '' @@ -260,8 +234,8 @@ sub _gconf_set { sub write { my ($glx) = @_; - my $server_start = member($glx->{method}, 'Xgl', 'Xmetisse'); - my $wm_start = member($glx->{method}, qw(native Xgl Xmetisse)); + my $server_start = member($glx->{method}, 'Xmetisse'); + my $wm_start = member($glx->{method}, qw(native Xmetisse)); addVarsInSh($::prefix . $compositing_server_config, { COMPOSITING_SERVER_START => bool2yesno($server_start), COMPOSITING_SERVER => $server_start && $glx->{method}, |