Skip to content
Snippets Groups Projects
Commit 51df4b71 authored by Simon McVittie's avatar Simon McVittie
Browse files

system-info: Add an undocumented --ignore-extra-drivers option


This is basically never going to be useful, except to test the previous
commit, so I haven't bothered to include it in the man page.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent ed82693b
No related branches found
No related tags found
1 merge request!97Fix flags behaviour
Pipeline #2278 passed
...@@ -131,6 +131,7 @@ enum ...@@ -131,6 +131,7 @@ enum
{ {
OPTION_HELP = 1, OPTION_HELP = 1,
OPTION_EXPECTATION, OPTION_EXPECTATION,
OPTION_IGNORE_EXTRA_DRIVERS,
OPTION_VERBOSE, OPTION_VERBOSE,
OPTION_VERSION, OPTION_VERSION,
}; };
...@@ -138,6 +139,7 @@ enum ...@@ -138,6 +139,7 @@ enum
struct option long_options[] = struct option long_options[] =
{ {
{ "expectations", required_argument, NULL, OPTION_EXPECTATION }, { "expectations", required_argument, NULL, OPTION_EXPECTATION },
{ "ignore-extra-drivers", no_argument, NULL, OPTION_IGNORE_EXTRA_DRIVERS },
{ "verbose", no_argument, NULL, OPTION_VERBOSE }, { "verbose", no_argument, NULL, OPTION_VERBOSE },
{ "version", no_argument, NULL, OPTION_VERSION }, { "version", no_argument, NULL, OPTION_VERSION },
{ "help", no_argument, NULL, OPTION_HELP }, { "help", no_argument, NULL, OPTION_HELP },
...@@ -535,6 +537,7 @@ main (int argc, ...@@ -535,6 +537,7 @@ main (int argc,
static const char * const multiarch_tuples[] = { SRT_ABI_I386, SRT_ABI_X86_64, NULL }; static const char * const multiarch_tuples[] = { SRT_ABI_I386, SRT_ABI_X86_64, NULL };
GList *icds; GList *icds;
const GList *icd_iter; const GList *icd_iter;
SrtDriverFlags extra_driver_flags = SRT_DRIVER_FLAGS_INCLUDE_ALL;
while ((opt = getopt_long (argc, argv, "", long_options, NULL)) != -1) while ((opt = getopt_long (argc, argv, "", long_options, NULL)) != -1)
{ {
...@@ -558,6 +561,10 @@ main (int argc, ...@@ -558,6 +561,10 @@ main (int argc,
argv[0], VERSION); argv[0], VERSION);
return 0; return 0;
case OPTION_IGNORE_EXTRA_DRIVERS:
extra_driver_flags = SRT_DRIVER_FLAGS_NONE;
break;
case OPTION_HELP: case OPTION_HELP:
usage (0); usage (0);
break; break;
...@@ -836,11 +843,11 @@ main (int argc, ...@@ -836,11 +843,11 @@ main (int argc,
print_graphics_details (builder, graphics_list); print_graphics_details (builder, graphics_list);
dri_list = srt_system_info_list_dri_drivers (info, multiarch_tuples[i], dri_list = srt_system_info_list_dri_drivers (info, multiarch_tuples[i],
SRT_DRIVER_FLAGS_INCLUDE_ALL); extra_driver_flags);
print_dri_details (builder, dri_list); print_dri_details (builder, dri_list);
va_api_list = srt_system_info_list_va_api_drivers (info, multiarch_tuples[i], va_api_list = srt_system_info_list_va_api_drivers (info, multiarch_tuples[i],
SRT_DRIVER_FLAGS_INCLUDE_ALL); extra_driver_flags);
print_va_api_details (builder, va_api_list); print_va_api_details (builder, va_api_list);
json_builder_end_object (builder); // End multiarch_tuple object json_builder_end_object (builder); // End multiarch_tuple object
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment