mirror of
https://codeberg.org/smxi/pinxi.git
synced 2024-09-28 15:20:29 +02:00
fixed egl version string, not fully numeric
This commit is contained in:
parent
5b976c8907
commit
dd1a83e06a
5 changed files with 71 additions and 6 deletions
43
data/graphics/egl-es/eglinfo-x11-vm-version-odd.txt
Normal file
43
data/graphics/egl-es/eglinfo-x11-vm-version-odd.txt
Normal file
|
@ -0,0 +1,43 @@
|
|||
libEGL warning: DRI2: failed to authenticate
|
||||
EGL API version: 1.4
|
||||
EGL vendor string: Mesa Project
|
||||
EGL version string: 1.4 (DRI2)
|
||||
EGL client APIs: OpenGL OpenGL_ES
|
||||
EGL extensions string:
|
||||
EGL_KHR_cl_event2 EGL_KHR_config_attribs
|
||||
EGL_KHR_context_flush_control EGL_KHR_create_context
|
||||
EGL_KHR_create_context_no_error EGL_KHR_fence_sync
|
||||
EGL_KHR_get_all_proc_addresses EGL_KHR_gl_colorspace
|
||||
EGL_KHR_gl_renderbuffer_image EGL_KHR_gl_texture_2D_image
|
||||
EGL_KHR_gl_texture_3D_image EGL_KHR_gl_texture_cubemap_image
|
||||
EGL_KHR_image_base EGL_KHR_no_config_context EGL_KHR_reusable_sync
|
||||
EGL_KHR_surfaceless_context EGL_EXT_pixel_format_float
|
||||
EGL_KHR_wait_sync EGL_MESA_configless_context EGL_MESA_drm_image
|
||||
EGL client extensions string:
|
||||
EGL_EXT_client_extensions EGL_EXT_platform_base
|
||||
EGL_KHR_client_get_all_proc_addresses EGL_KHR_debug
|
||||
EGL_EXT_platform_wayland EGL_EXT_platform_x11 EGL_MESA_platform_gbm
|
||||
Configurations:
|
||||
bf lv colorbuffer dp st ms vis cav bi renderable supported
|
||||
id sz l r g b a th cl ns b id eat nd gl es es2 vg surfaces
|
||||
---------------------------------------------------------------------
|
||||
0x01 32 0 8 8 8 8 0 0 0 0 0x21TC a y y y win,pb,pix
|
||||
0x02 32 0 8 8 8 8 16 0 0 0 0x21TC a y y y win,pb,pix
|
||||
0x03 32 0 8 8 8 8 24 0 0 0 0x21TC a y y y win,pb,pix
|
||||
0x04 32 0 8 8 8 8 24 8 0 0 0x21TC a y y y win,pb,pix
|
||||
0x05 32 0 8 8 8 8 32 0 0 0 0x21TC a y y y win,pb,pix
|
||||
0x06 24 0 8 8 8 0 0 0 0 0 0x21TC y y y y win,pb,pix
|
||||
0x07 24 0 8 8 8 0 16 0 0 0 0x21TC y y y y win,pb,pix
|
||||
0x08 24 0 8 8 8 0 24 0 0 0 0x21TC y y y y win,pb,pix
|
||||
0x09 24 0 8 8 8 0 24 8 0 0 0x21TC y y y y win,pb,pix
|
||||
0x0a 24 0 8 8 8 0 32 0 0 0 0x21TC y y y y win,pb,pix
|
||||
0x0b 32 0 8 8 8 8 0 0 0 0 0x311DC a y y y win,pb,pix
|
||||
0x0c 32 0 8 8 8 8 16 0 0 0 0x311DC a y y y win,pb,pix
|
||||
0x0d 32 0 8 8 8 8 24 0 0 0 0x311DC a y y y win,pb,pix
|
||||
0x0e 32 0 8 8 8 8 24 8 0 0 0x311DC a y y y win,pb,pix
|
||||
0x0f 32 0 8 8 8 8 32 0 0 0 0x311DC a y y y win,pb,pix
|
||||
0x10 24 0 8 8 8 0 0 0 0 0 0x311DC y y y y win,pb,pix
|
||||
0x11 24 0 8 8 8 0 16 0 0 0 0x311DC y y y y win,pb,pix
|
||||
0x12 24 0 8 8 8 0 24 0 0 0 0x311DC y y y y win,pb,pix
|
||||
0x13 24 0 8 8 8 0 24 8 0 0 0x311DC y y y y win,pb,pix
|
||||
0x14 24 0 8 8 8 0 32 0 0 0 0x311DC y y y y win,pb,pix
|
|
@ -345,6 +345,13 @@ pw: nwg
|
|||
|
||||
----------------------------------------
|
||||
|
||||
pslinux os live cd:
|
||||
|
||||
user: su/root
|
||||
pw: root
|
||||
|
||||
----------------------------------------
|
||||
|
||||
peppermint live cd:
|
||||
|
||||
For screen saver:
|
||||
|
|
|
@ -274,6 +274,15 @@ General power daemon
|
|||
process: power-profiles-daemon [not verified]
|
||||
conflicts: tlp
|
||||
|
||||
----------------------------------------
|
||||
tdeowersave
|
||||
----------------------------------------
|
||||
|
||||
TDE power daemon
|
||||
|
||||
process: tdepowersave
|
||||
conflicts:
|
||||
|
||||
----------------------------------------
|
||||
thermald
|
||||
----------------------------------------
|
||||
|
|
9
pinxi
9
pinxi
|
@ -15762,6 +15762,7 @@ sub gl_data {
|
|||
# $file = "$fake_data_dir/graphics/egl-es/eglinfo-intel-atom-dell_studio-bm.txt";
|
||||
# $file = "$fake_data_dir/graphics/egl-es/eglinfo-asus_1025c-atom-bm.txt";
|
||||
# $file = "$fake_data_dir/graphics/egl-es/eglinfo-x11-amd-raphael-1.txt";
|
||||
$file = "$fake_data_dir/graphics/egl-es/eglinfo-x11-vm-version-odd.txt";
|
||||
$gl_data = main::reader($file,'','ref');
|
||||
}
|
||||
}
|
||||
|
@ -15829,6 +15830,8 @@ sub gl_data {
|
|||
}
|
||||
}
|
||||
elsif ($working[0] eq 'EGL version string'){
|
||||
# seen case of: 1.4 (DRI2)
|
||||
$working[1] =~ s/^([\d\.]+)(\s.*)?/$1/;
|
||||
if (!defined $platform){
|
||||
$gl->{'egl'}{'data'}{'version'} = $working[1];
|
||||
}
|
||||
|
@ -29953,7 +29956,7 @@ sub set_xprop {
|
|||
if (my $program = main::check_program('xprop')){
|
||||
$data = main::grabber("xprop -root $display_opt 2>/dev/null",'','strip','ref');
|
||||
if ( @$data){
|
||||
my $pattern = '_(MIT|WIN|XROOTPMAP)_|_NET_(CLIENT|SUPPORTED)|';
|
||||
my $pattern = '_(MIT|QT_DESKTOP|WIN|XROOTPMAP)_|_NET_(CLIENT|SUPPORTED)|';
|
||||
$pattern .= '(AT_SPI|ESETROOT|GDK_VISUALS|GNOME_SM|PULSE|RESOURCE_|XKLAVIER';
|
||||
@$data = grep {!/^($pattern))/} @$data;
|
||||
}
|
||||
|
@ -35523,8 +35526,8 @@ sub set_power {
|
|||
eval $start if $b_log;
|
||||
process_items(\@{$ps_data{'power-daemons'}},join('|', qw(apmd csd-power
|
||||
gnome-power-manager gsd-power kpowersave org_kde_powerdevil mate-power-manager
|
||||
power-profiles-daemon powersaved thermald tlp upowerd ukui-power-manager
|
||||
xfce4-power-manager)));
|
||||
power-profiles-daemon powersaved tdepowersave thermald tlp
|
||||
upowerd ukui-power-manager xfce4-power-manager)));
|
||||
print '$ps_data{power-daemons}: ', Data::Dumper::Dumper $ps_data{'power-daemons'} if $dbg[5];
|
||||
main::log_data('dump','$ps_data{power-daemons}',$ps_data{'power-daemons'}) if $b_log;
|
||||
eval $end if $b_log;
|
||||
|
|
|
@ -199,9 +199,12 @@ often worked before, but now are more robust.
|
|||
|
||||
5. RECOMMENDS: wrong package name for pacman eglinfo, glxinfo.
|
||||
|
||||
6a. GRAPHICS: gl_data(): fixed use of undefined $platform, missed some, those
|
||||
can and did spew out errors in some cases due to trying to use undefined hash
|
||||
key name.
|
||||
6a. GRAPHICS: gl_data():
|
||||
|
||||
* fixed use of undefined $platform, missed some, those can and did spew out
|
||||
errors in some cases due to trying to use undefined hash key name.
|
||||
|
||||
* fixed case where EGL version was not fully numeric: 1.4 (DRI2)
|
||||
|
||||
6b. GRAPHICS: API data: see Bug 4. Was missing one api data error message type.
|
||||
This led to output of undefined value print errors. The real cause however was
|
||||
|
|
Loading…
Reference in a new issue