improve gpu driver checks when no game was booted

RPCS3 · Feb 24, 2019 · 3ac6834 · 3ac6834
1 parent 1813033
commit 3ac6834
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs
@@ -119,8 +119,8 @@ private static async Task BuildNotesSectionAsync(DiscordEmbedBuilder builder, Lo
                 }
             }
 
-            if (supportedGpu
-                && items["gpu_info"] is string gpuInfo)
+            var gpuInfo = items["gpu_info"] ?? items["discrete_gpu_info"];
+            if (supportedGpu && !string.IsNullOrEmpty(gpuInfo))
             {
                 if (IntelGpuModel.Match(gpuInfo) is Match intelMatch
                     && intelMatch.Success)

diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs
@@ -153,10 +153,20 @@ private static void CleanupValues(NameValueCollection items)
 
             if (items["vulkan_compatible_device_name"] is string vulkanDevices)
             {
-                var deviceNames = vulkanDevices.Split(Environment.NewLine)
+                var devices = vulkanDevices.Split(Environment.NewLine)
                     .Distinct()
-                    .Select(n => $"{n} ({GetVulkanDriverVersion(n, items["vulkan_found_device"])})");
-                items["gpu_available_info"] = string.Join(Environment.NewLine, deviceNames);
+                    .Select(n => new {name = n, driverVersion = GetVulkanDriverVersion(n, items["vulkan_found_device"])})
+                    .Reverse()
+                    .ToList();
+                if (string.IsNullOrEmpty(items["gpu_info"]) && devices.Count > 0)
+                {
+                    var discreteGpu = devices.FirstOrDefault(d => IsNvidia(d.name))
+                                      ?? devices.FirstOrDefault(d => IsAmd(d.name))
+                                      ?? devices.First();
+                    items["discrete_gpu_info"] = $"{discreteGpu.name} ({discreteGpu.driverVersion})";
+                    items["driver_version_info"] = discreteGpu.driverVersion;
+                }
+                items["gpu_available_info"] = string.Join(Environment.NewLine, devices.Select(d => $"{d.name} ({d.driverVersion})"));
             }
 
             if (items["af_override"] is string af)