meson: use sections in summary()

Makes the list easier to read

Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12161>
This commit is contained in:
Thomas H.P. Andersen 2023-01-18 22:56:39 +01:00 committed by Marge Bot
parent 6c0dc0b2a7
commit 7bed7d9475

View File

@ -2087,35 +2087,44 @@ subdir('src')
meson.add_devenv(devenv) meson.add_devenv(devenv)
summary_lines = { meson.add_devenv(devenv)
'prefix': get_option('prefix'),
'libdir': get_option('libdir'),
'includedir': get_option('includedir'),
'OpenGL': with_opengl, summary(
'ES1': with_gles1, {
'ES2': with_gles2, 'prefix': get_option('prefix'),
'libdir': get_option('libdir'),
'includedir': get_option('includedir'),
},
section: 'Directories'
)
'OSMesa': with_osmesa ? 'lib' + osmesa_lib_name : false} summary(
{
'OpenGL': with_opengl,
'ES1': with_gles1,
'ES2': with_gles2,
'Shared glapi': with_shared_glapi,
},
section: 'OpenGL', bool_yn: true
)
if with_dri summary(
summary_lines += { {
'DRI platform': with_dri_platform, 'Platform': with_dri_platform,
'DRI driver dir': dri_drivers_path 'Driver dir': dri_drivers_path,
} },
endif section: 'DRI', bool_yn: true, list_sep: ' '
)
if with_glx == 'disabled' summary(
summary_lines += {'GLX': false} {
elif with_glx == 'dri' 'Enabled': with_glx != 'disabled',
summary_lines += {'GLX': 'DRI-based'} 'Provider': with_glx == 'disabled' ? 'None' : with_glx
elif with_glx == 'xlib' },
summary_lines += {'GLX': 'Xlib-based'} section: 'GLX', bool_yn: true, list_sep: ' '
else )
summary_lines += {'GLX': with_glx}
endif
summary_lines += {'EGL': with_egl} egl_summary = {'Enabled': with_egl}
if with_egl if with_egl
egl_drivers = [] egl_drivers = []
if with_dri if with_dri
@ -2127,68 +2136,70 @@ if with_egl
if with_platform_windows if with_platform_windows
egl_drivers += 'builtin:wgl' egl_drivers += 'builtin:wgl'
endif endif
summary_lines += {'EGL drivers': egl_drivers} egl_summary += {'Drivers': egl_drivers}
endif egl_summary += {'Platforms': _platforms}
if with_egl or with_any_vk
_platforms += 'surfaceless'
if with_gbm and not with_platform_android
_platforms += 'drm'
endif
summary_lines += {'EGL/Vulkan/VL platforms': _platforms}
endif endif
summary(egl_summary, section: 'EGL', bool_yn: true, list_sep: ' ')
summary_lines += {'GBM': with_gbm} gbm_summary = {'Enabled': with_gbm}
if with_gbm if with_gbm
summary_lines += {'GBM backends path': gbm_backends_path} gbm_summary += {'Backends path': gbm_backends_path}
endif endif
summary(gbm_summary, section: 'GBM', bool_yn: true, list_sep: ' ')
summary_lines += {'Vulkan drivers': _vulkan_drivers.length() != 0 ? _vulkan_drivers : false } vulkan_summary = {'Drivers': _vulkan_drivers.length() != 0 ? _vulkan_drivers : false }
summary_lines += {'Video Codecs': _codecs.length() != 0 ? _codecs : false }
if with_any_vk if with_any_vk
summary_lines += {'Vulkan ICD dir': with_vulkan_icd_dir} vulkan_summary += {'Platforms': _platforms}
vulkan_summary += {'ICD dir': with_vulkan_icd_dir}
if with_any_vulkan_layers if with_any_vulkan_layers
summary_lines += {'Vulkan layers': get_option('vulkan-layers')} vulkan_summary += {'Layers': get_option('vulkan-layers')}
endif endif
summary_lines += {'Vulkan Intel Ray Tracing': with_intel_vk_rt} vulkan_summary += {'Video codecs': _codecs.length() != 0 ? _codecs : false}
vulkan_summary += {'Ray tracing': with_intel_vk_rt ? 'intel' : false}
endif endif
summary(vulkan_summary, section: 'Vulkan', bool_yn: true, list_sep: ' ')
summary_lines += {'llvm': with_llvm} llvm_summary = {'Enabled': with_llvm}
if with_llvm if with_llvm
summary_lines += {'llvm-version': dep_llvm.version()} llvm_summary += {'Version': dep_llvm.version()}
endif endif
summary(llvm_summary, section: 'LLVM', bool_yn: true, list_sep: ' ')
summary_lines += {'Gallium': with_gallium} gallium_summary = {'Enabled': with_gallium}
if with_gallium if with_gallium
summary_lines += {'Gallium drivers': gallium_drivers} gallium_summary += {'Drivers': gallium_drivers}
gallium_summary += {'Platforms': _platforms}
gallium_st = ['mesa'] gallium_frontends = ['mesa']
if with_gallium_xa if with_gallium_xa
gallium_st += 'xa' gallium_frontends += 'xa'
endif endif
if with_gallium_vdpau if with_gallium_vdpau
gallium_st += 'vdpau' gallium_frontends += 'vdpau'
endif endif
if with_gallium_omx != 'disabled' if with_gallium_omx != 'disabled'
gallium_st += 'omx' + with_gallium_omx gallium_frontends += 'omx' + with_gallium_omx
endif endif
if with_gallium_va if with_gallium_va
gallium_st += 'va' gallium_frontends += 'va'
endif endif
if with_gallium_st_nine if with_gallium_st_nine
gallium_st += 'nine' gallium_frontends += 'nine'
endif endif
if with_gallium_opencl if with_gallium_opencl
gallium_st += 'clover' gallium_frontends += 'clover'
endif endif
summary_lines += {'Gallium st': gallium_st} if with_gallium_rusticl
gallium_frontends += 'rusticl'
endif
gallium_summary += {'Frontends': gallium_frontends}
gallium_summary += {'Off-screen rendering': with_osmesa ? 'lib' + osmesa_lib_name : false}
gallium_summary += {'HUD lm-sensors': dep_lmsensors.found()}
endif endif
summary(gallium_summary, section: 'Gallium', bool_yn: true, list_sep: ' ')
summary_lines += {'HUD lmsensors': dep_lmsensors.found()} perfetto_summary = {'Enabled': with_perfetto}
summary_lines += {'Shared-glapi': with_shared_glapi} if with_perfetto and with_any_datasource
perfetto_summary += {'Data source': with_datasources}
summary_lines += {'Perfetto': with_perfetto}
if with_any_datasource
summary_lines += {'Perfetto ds': with_datasources}
endif endif
summary(summary_lines, section: 'Configuration summary', bool_yn: true, list_sep: ' ') summary(perfetto_summary, section: 'Perfetto', bool_yn: true, list_sep: ' ')