From c2dfc02ff81cfbaa78c2bf061ff036563e05c6dc Mon Sep 17 00:00:00 2001 From: "Jerome A." Date: Thu, 14 Mar 2024 14:42:07 +0800 Subject: [PATCH 1/6] Add hypervisor in logfile outputs --- robocop_ng/helpers/ryujinx_log_analyser.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/robocop_ng/helpers/ryujinx_log_analyser.py b/robocop_ng/helpers/ryujinx_log_analyser.py index 136afeba..9765fd25 100644 --- a/robocop_ng/helpers/ryujinx_log_analyser.py +++ b/robocop_ng/helpers/ryujinx_log_analyser.py @@ -177,6 +177,7 @@ def __init_members(self): "anisotropic_filtering": "Unknown", "aspect_ratio": "Unknown", "texture_recompression": "Unknown", + "hypervisor": "Unknown", } self._notes = set() self._log_errors = [] @@ -338,7 +339,7 @@ def __get_setting_value(self, name, key): else: return "Unknown" - case "pptc" | "shader_cache" | "texture_recompression" | "vsync": + case "pptc" | "shader_cache" | "texture_recompression" | "vsync" | "hypervisor": return "Enabled" if value == "True" else "Disabled" case _: @@ -361,6 +362,7 @@ def __get_settings_info(self): "shader_cache": "EnableShaderCache", "texture_recompression": "EnableTextureRecompression", "vsync": "EnableVsync", + "hypervisor": "UseHypervisor", } for key in self._settings.keys(): @@ -426,6 +428,13 @@ def __get_os_notes(self): self._notes.add( "**⚠️ AMD GPU users should consider using Vulkan graphics backend**" ) + if ( + "MacOS" in self.__hardware_info["os"] + and self.__settings["hypervisor"] != "Enabled" + ): + self.__notes.add( + "**⚠️ Hypervisor disabled, consider changing into Enabled.**" + ) def __get_log_notes(self): default_logs = ["Info", "Warning", "Error", "Guest"] From 8aed801269c6e6c10fe4e8f2dc19c58df2857467 Mon Sep 17 00:00:00 2001 From: "Jerome A." Date: Mon, 18 Mar 2024 15:38:13 +0800 Subject: [PATCH 2/6] fix typings --- robocop_ng/helpers/ryujinx_log_analyser.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/robocop_ng/helpers/ryujinx_log_analyser.py b/robocop_ng/helpers/ryujinx_log_analyser.py index 9765fd25..be1fb723 100644 --- a/robocop_ng/helpers/ryujinx_log_analyser.py +++ b/robocop_ng/helpers/ryujinx_log_analyser.py @@ -429,12 +429,12 @@ def __get_os_notes(self): "**⚠️ AMD GPU users should consider using Vulkan graphics backend**" ) if ( - "MacOS" in self.__hardware_info["os"] - and self.__settings["hypervisor"] != "Enabled" + "mac" in self._hardware_info["os"] ): - self.__notes.add( - "**⚠️ Hypervisor disabled, consider changing into Enabled.**" - ) + if self._settings["hypervisor"] != "Enabled": + self._notes.add( + "**⚠️ Hypervisor disabled, consider changing to Enabled.**" + ) def __get_log_notes(self): default_logs = ["Info", "Warning", "Error", "Guest"] From 2fd033297e5878b4b2cbdf763801e68017d74732 Mon Sep 17 00:00:00 2001 From: "Jerome A." Date: Mon, 18 Mar 2024 17:39:33 +0800 Subject: [PATCH 3/6] moved setting --- robocop_ng/helpers/ryujinx_log_analyser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robocop_ng/helpers/ryujinx_log_analyser.py b/robocop_ng/helpers/ryujinx_log_analyser.py index be1fb723..4c2efc93 100644 --- a/robocop_ng/helpers/ryujinx_log_analyser.py +++ b/robocop_ng/helpers/ryujinx_log_analyser.py @@ -173,11 +173,11 @@ def __init_members(self): "pptc": "Unknown", "shader_cache": "Unknown", "vsync": "Unknown", + "hypervisor": "Unknown", "resolution_scale": "Unknown", "anisotropic_filtering": "Unknown", "aspect_ratio": "Unknown", "texture_recompression": "Unknown", - "hypervisor": "Unknown", } self._notes = set() self._log_errors = [] From 24c1e3c5983efdeeffebd8fb6e4da94a73f42af1 Mon Sep 17 00:00:00 2001 From: "Jerome A." Date: Sat, 23 Mar 2024 15:51:44 +0800 Subject: [PATCH 4/6] Check if macos or not --- robocop_ng/helpers/ryujinx_log_analyser.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/robocop_ng/helpers/ryujinx_log_analyser.py b/robocop_ng/helpers/ryujinx_log_analyser.py index 4c2efc93..389c6668 100644 --- a/robocop_ng/helpers/ryujinx_log_analyser.py +++ b/robocop_ng/helpers/ryujinx_log_analyser.py @@ -135,8 +135,8 @@ def __init__(self, log_text: Union[str, list[str]]): raise ValueError("No log entries found.") self.__get_errors() - self.__get_settings_info() self.__get_hardware_info() + self.__get_settings_info() self.__get_ryujinx_info() self.__get_app_name() self.__get_mods() @@ -339,9 +339,14 @@ def __get_setting_value(self, name, key): else: return "Unknown" - case "pptc" | "shader_cache" | "texture_recompression" | "vsync" | "hypervisor": + case "pptc" | "shader_cache" | "texture_recompression" | "vsync": return "Enabled" if value == "True" else "Disabled" + case "hypervisor": + if "mac" in self._hardware_info["os"]: + return "Enabled" if value == "True" else "Disabled" + else: + return "Not Applicable" case _: return value @@ -428,13 +433,6 @@ def __get_os_notes(self): self._notes.add( "**⚠️ AMD GPU users should consider using Vulkan graphics backend**" ) - if ( - "mac" in self._hardware_info["os"] - ): - if self._settings["hypervisor"] != "Enabled": - self._notes.add( - "**⚠️ Hypervisor disabled, consider changing to Enabled.**" - ) def __get_log_notes(self): default_logs = ["Info", "Warning", "Error", "Guest"] From f73e88342976fe369b752f425a8f5b1c3133a5f9 Mon Sep 17 00:00:00 2001 From: TSR Berry <20988865+TSRBerry@users.noreply.github.com> Date: Wed, 15 May 2024 16:55:33 +0200 Subject: [PATCH 5/6] Replace "Not applicable" with "N/A" --- robocop_ng/helpers/ryujinx_log_analyser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robocop_ng/helpers/ryujinx_log_analyser.py b/robocop_ng/helpers/ryujinx_log_analyser.py index 389c6668..6ae1385e 100644 --- a/robocop_ng/helpers/ryujinx_log_analyser.py +++ b/robocop_ng/helpers/ryujinx_log_analyser.py @@ -346,7 +346,7 @@ def __get_setting_value(self, name, key): if "mac" in self._hardware_info["os"]: return "Enabled" if value == "True" else "Disabled" else: - return "Not Applicable" + return "N/A" case _: return value From 70e489b83534a840e8cd47dede51a4a75c419000 Mon Sep 17 00:00:00 2001 From: TSR Berry <20988865+TSRBerry@users.noreply.github.com> Date: Wed, 15 May 2024 16:55:51 +0200 Subject: [PATCH 6/6] Add hypervisor setting to embed --- robocop_ng/cogs/logfilereader.py | 1 + 1 file changed, 1 insertion(+) diff --git a/robocop_ng/cogs/logfilereader.py b/robocop_ng/cogs/logfilereader.py index 4f2164fc..8406aa03 100644 --- a/robocop_ng/cogs/logfilereader.py +++ b/robocop_ng/cogs/logfilereader.py @@ -144,6 +144,7 @@ def format_analysed_log(self, author_name: str, analysed_log): f"**PPTC Cache:** `{analysed_log['settings']['pptc']}`", f"**Shader Cache:** `{analysed_log['settings']['shader_cache']}`", f"**V-Sync:** `{analysed_log['settings']['vsync']}`", + f"**Hypervisor:** `{analysed_log['settings']['hypervisor']}`", ) )