[Feat] Add better Compatibility layer support for Intel Macs

Author: flavioislima

src/backend/config.ts

@@ -19,7 +19,8 @@ import {
   isWindows,
   getSteamCompatFolder,
   configStore,
-  isLinux
+  isLinux,
+  isIntelMac
 } from './constants'
 
 import { logError, logInfo, LogPrefix } from './logger/logger'
@@ -290,7 +291,7 @@ class GlobalConfigV0 extends GlobalConfig {
       enableUpdates: false,
       addDesktopShortcuts: false,
       addStartMenuShortcuts: false,
-      autoInstallDxvk: isLinux,
+      autoInstallDxvk: isLinux || isIntelMac,
       autoInstallVkd3d: isLinux,
       autoInstallDxvkNvapi: false,
       addSteamShortcuts: false,

src/backend/constants.ts

@@ -1,5 +1,5 @@
 import { spawnSync } from 'child_process'
-import { homedir, platform } from 'os'
+import { cpus, homedir, platform } from 'os'
 import { join } from 'path'
 import { parse } from '@node-steam/vdf'
 
@@ -36,6 +36,7 @@ const fontsStore = new TypeCheckedStoreBackend('fontsStore', {
 })
 
 const isMac = platform() === 'darwin'
+const isIntelMac: boolean = isMac && cpus()[0].model.includes('Intel') // so we can have different behavior for Intel Macs
 const isWindows = platform() === 'win32'
 const isLinux = platform() === 'linux'
 const isSteamDeckGameMode = process.env.XDG_CURRENT_DESKTOP === 'gamescope'
@@ -270,6 +271,7 @@ export {
   installed,
   isFlatpak,
   isMac,
+  isIntelMac,
   isWindows,
   isLinux,
   legendaryConfigPath,

src/backend/launcher.ts

@@ -12,6 +12,7 @@ import { join, normalize } from 'path'
 import {
   defaultWinePrefix,
   flatPakHome,
+  isIntelMac,
   isLinux,
   isMac,
   isWindows,
@@ -515,7 +516,8 @@ export async function validWine(
   const haveAll = necessary.every((binary) => existsSync(binary as string))
 
   if (isMac && type === 'toolkit') {
-    const isGPTKCompatible = await isMacSonomaOrHigher()
+    const isMacOSUpToDate = await isMacSonomaOrHigher()
+    const isGPTKCompatible: boolean = isMacOSUpToDate && !isIntelMac
     if (!isGPTKCompatible) {
       return false
     }

src/backend/utils/compatibility_layers.ts

@@ -3,6 +3,7 @@ import {
   configPath,
   getSteamLibraries,
   icon,
+  isIntelMac,
   isLinux,
   isMac,
   isWindows,
@@ -624,7 +625,9 @@ export async function downloadDefaultWine() {
     const availableWine = wineDownloaderInfoStore.get('wine-releases', [])
 
     // use Proton-GE type if on Linux and GPTK or Wine-Crossover if on Mac
-    const isGPTKCompatible = isMac ? await isMacSonomaOrHigher() : false
+    const isMacOSUpToDate = await isMacSonomaOrHigher()
+    const isGPTKCompatible = isMac ? isMacOSUpToDate && !isIntelMac : false
+
     const results = await Promise.all(
       availableWine.map(async (version) => {
         if (isLinux) {

src/frontend/screens/WineManager/index.tsx

@@ -26,6 +26,7 @@ const configStore = new TypeCheckedStoreFrontend('wineManagerConfigStore', {
 export default React.memo(function WineManager(): JSX.Element | null {
   const { t } = useTranslation()
   const { refreshWineVersionInfo, platform } = useContext(ContextProvider)
+  const isIntelMac = platform === 'darwin' && process.arch === 'x64'
   const isLinux = platform === 'linux'
 
   const protonge: WineManagerUISettings = {
@@ -40,9 +41,26 @@ export default React.memo(function WineManager(): JSX.Element | null {
     enabled: !isLinux
   }
 
+  const wineCrossover: WineManagerUISettings = {
+    type: 'Wine-Crossover',
+    value: 'winecrossover',
+    enabled: !isLinux
+  }
+
+  const getDefaultRepository = (): WineManagerUISettings => {
+    if (isLinux) {
+      return protonge
+    } else if (isIntelMac) {
+      return wineCrossover
+    } else {
+      return gamePortingToolkit
+    }
+  }
+
   const [repository, setRepository] = useState<WineManagerUISettings>(
-    isLinux ? protonge : gamePortingToolkit
+    getDefaultRepository()
   )
+
   const [wineManagerSettings, setWineManagerSettings] = useState<
     WineManagerUISettings[]
   >([