GPU: fix hiding unknown GPUs

The hide-type option now actually hides any unknown GPUs by default
(hide-type == "unknown"). The old behavior (not hiding any GPUs) can be
restored with "none".

Author: SimSaladin

doc/json_schema.json

@@ -2053,9 +2053,10 @@
                                         "enum": [
                                             "integrated",
                                             "discrete",
+                                            "unknown",
                                             "none"
                                         ],
-                                        "default": "none"
+                                        "default": "unknown"
                                     },
                                     "key": {
                                         "$ref": "#/$defs/key"

src/data/help.json

@@ -1145,9 +1145,10 @@
                 "enum": {
                     "integrated": "Hide integrated GPUs",
                     "discrete": "Hide discrete GPUs",
+                    "unknown": "Hide unknown (unrecognized) GPUs",
                     "none": "Do not hide any GPUs"
                 },
-                "default": "none"
+                "default": "unknown"
             }
         },
         {

src/modules/gpu/gpu.c

@@ -173,6 +173,9 @@ void ffPrintGPU(FFGPUOptions* options)
 
     FF_LIST_FOR_EACH(FFGPUResult, gpu, gpus)
     {
+        if(gpu->type == FF_GPU_TYPE_UNKNOWN && options->hideType == FF_GPU_TYPE_UNKNOWN)
+            continue;
+
         if(gpu->type == FF_GPU_TYPE_INTEGRATED && options->hideType == FF_GPU_TYPE_INTEGRATED)
             continue;
 
@@ -230,7 +233,8 @@ bool ffParseGPUCommandOptions(FFGPUOptions* options, const char* key, const char
     if (ffStrEqualsIgnCase(subKey, "hide-type"))
     {
         options->hideType = (FFGPUType) ffOptionParseEnum(key, value, (FFKeyValuePair[]) {
-            { "none", FF_GPU_TYPE_UNKNOWN },
+            { "none", FF_GPU_TYPE_NONE },
+            { "unknown", FF_GPU_TYPE_UNKNOWN },
             { "integrated", FF_GPU_TYPE_INTEGRATED },
             { "discrete", FF_GPU_TYPE_DISCRETE },
             {},
@@ -288,7 +292,8 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module)
         {
             int value;
             const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
-                { "none", FF_GPU_TYPE_UNKNOWN },
+                { "none", FF_GPU_TYPE_NONE },
+                { "unknown", FF_GPU_TYPE_UNKNOWN },
                 { "integrated", FF_GPU_TYPE_INTEGRATED },
                 { "discrete", FF_GPU_TYPE_DISCRETE },
                 {},
@@ -345,9 +350,12 @@ void ffGenerateGPUJsonConfig(FFGPUOptions* options, yyjson_mut_doc* doc, yyjson_
     {
         switch (options->hideType)
         {
-            case FF_GPU_TYPE_UNKNOWN:
+            case FF_GPU_TYPE_NONE:
                 yyjson_mut_obj_add_str(doc, module, "hideType", "none");
                 break;
+            case FF_GPU_TYPE_UNKNOWN:
+                yyjson_mut_obj_add_str(doc, module, "hideType", "unknown");
+                break;
             case FF_GPU_TYPE_INTEGRATED:
                 yyjson_mut_obj_add_str(doc, module, "hideType", "integrated");
                 break;

src/modules/gpu/option.h

@@ -7,6 +7,7 @@
 
 typedef enum __attribute__((__packed__)) FFGPUType
 {
+    FF_GPU_TYPE_NONE,
     FF_GPU_TYPE_UNKNOWN,
     FF_GPU_TYPE_INTEGRATED,
     FF_GPU_TYPE_DISCRETE,