diff --git a/CompatBot/EventHandlers/LogParsing/LogParser.LogSections.cs b/CompatBot/EventHandlers/LogParsing/LogParser.LogSections.cs index 795c2abf..af508ce8 100644 --- a/CompatBot/EventHandlers/LogParsing/LogParser.LogSections.cs +++ b/CompatBot/EventHandlers/LogParsing/LogParser.LogSections.cs @@ -191,8 +191,9 @@ namespace CompatBot.EventHandlers.LogParsing ["Renderer initialized on device"] = new Regex(@"Renderer initialized on device '(?.+)'\r?$", DefaultOptions), ["RSX: Failed to compile shader"] = new Regex(@"RSX: Failed to compile shader: ERROR: (?.+?)\r?$", DefaultOptions), ["RSX: Compilation failed"] = new Regex(@"RSX: Compilation failed: ERROR: (?.+?)\r?$", DefaultOptions), - ["RSX: Your GPU does not support"] = new Regex(@"RSX: Your GPU does not support (?.+)\..+?\r?$", DefaultOptions), - ["RSX: GPU/driver lacks support"] = new Regex(@"RSX: GPU/driver lacks support for (?.+)\..+?\r?$", DefaultOptions), + ["RSX: Unsupported device"] = new Regex(@"RSX: Unsupported device: (?.+)\..+?\r?$", DefaultOptions), + ["RSX: Your GPU does not support"] = new Regex(@"RSX: Your GPU does not support (?.+)\..+?\r?$", DefaultOptions), + ["RSX: GPU/driver lacks support"] = new Regex(@"RSX: GPU/driver lacks support for (?.+)\..+?\r?$", DefaultOptions), ["RSX: Swapchain:"] = new Regex(@"RSX: Swapchain: present mode (?\d+?) in use.+?\r?$", DefaultOptions), ["F "] = new Regex(@"F \d+:\d+:\d+\.\d+ (({(?[^}]+)} )?(\w+:\s*|(\w+:\s*)?(class [^\r\n]+ thrown: ))\r?\n?)(?.*?)(\r?\n)(\r?\n|\xC2\xB7)", DefaultSingleLineOptions), ["Failed to load RAP file:"] = new Regex(@"Failed to load RAP file: (?.*?\.rap).*\r?$", DefaultOptions), @@ -239,7 +240,7 @@ namespace CompatBot.EventHandlers.LogParsing "broken_directory", "edat_block_offset", "failed_to_verify", - "rsx_not_supported", + "rsx_not_supported_feature", }; public static readonly string[] CountValueItems = {"enqueue_buffer_error"}; diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs index cf71ecd3..cbe67960 100644 --- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs +++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs @@ -313,7 +313,7 @@ namespace CompatBot.Utils.ResultFormatters } } - var supportedGpu = true; + var supportedGpu = string.IsNullOrEmpty(items["rsx_unsupported_gpu"]); Version oglVersion = null; if (items["opengl_version"] is string oglVersionString) Version.TryParse(oglVersionString, out oglVersion); diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.WeirdSettingsSection.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.WeirdSettingsSection.cs index dad01a50..50cc41a5 100644 --- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.WeirdSettingsSection.cs +++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.WeirdSettingsSection.cs @@ -64,6 +64,9 @@ namespace CompatBot.Utils.ResultFormatters && items["supported_gpu"] == EnabledMark && !GowHDIds.Contains(serial)) notes.Add("⚠ `Vulkan` is the recommended `Renderer`"); + if (items["renderer"] == "Vulkan" + && items["supported_gpu"] == DisabledMark) + notes.Add("❌ Selected `Vulkan` device is not supported, please use `OpenGL` instead"); if (!string.IsNullOrEmpty(items["resolution"]) && items["resolution"] != "1280x720") { if (items["game_category"] != "1P" @@ -139,7 +142,7 @@ namespace CompatBot.Utils.ResultFormatters if (KnownDisableVertexCacheIds.Contains(serial) && !vertexCacheDisabled) notes.Add("⚠ This game requires disabling `Vertex Cache` option"); - if (multiItems["rsx_not_supported"].Contains("alpha-to-one for multisampling")) + if (multiItems["rsx_not_supported_feature"].Contains("alpha-to-one for multisampling")) { if (items["msaa"] is string msaa && msaa != "Disabled") generalNotes.Add("ℹ The driver or GPU do not support all required features for proper MSAA implementation, which may result in minor visual artifacts"); diff --git a/discord-bot-net.sln.DotSettings b/discord-bot-net.sln.DotSettings index 7f919c8a..e5fc383e 100644 --- a/discord-bot-net.sln.DotSettings +++ b/discord-bot-net.sln.DotSettings @@ -5,9 +5,11 @@ True True True + True True True True True + True True True \ No newline at end of file