From a335c8ff2ba5a6886ec76523795871c351bdf2e4 Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Mon, 23 Dec 2024 22:37:15 -0600 Subject: [PATCH] UI: Collapse IsHypervisorAvailable and IsMetalAvailable into IsAppleSiliconMac --- src/Ryujinx/UI/ViewModels/SettingsViewModel.cs | 5 +---- src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml | 2 +- src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs index 2d20af825..0ee1c9def 100644 --- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs @@ -120,12 +120,9 @@ namespace Ryujinx.Ava.UI.ViewModels } } - public bool IsMetalAvailable => - OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64; - public bool IsOpenGLAvailable => !OperatingSystem.IsMacOS(); - public bool IsHypervisorAvailable => OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64; + public bool IsAppleSiliconMac => OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64; public bool GameDirectoryChanged { diff --git a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml index c7f03a45d..83f908a9c 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml @@ -69,7 +69,7 @@ diff --git a/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml index 1f3cfd46c..c3693ac5f 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml @@ -45,7 +45,7 @@ - +