Move DXVK version detection into its own function

Author: CommandMC

src/backend/tools.ts

@@ -12,7 +12,14 @@ import {
 import { exec, spawn } from 'child_process'
 
 import { execAsync, getWineFromProton } from './utils'
-import { execOptions, toolsPath, isMac, isWindows, userHome } from './constants'
+import {
+  execOptions,
+  toolsPath,
+  isMac,
+  isWindows,
+  userHome,
+  isLinux
+} from './constants'
 import { logError, logInfo, LogPrefix, logWarning } from './logger/logger'
 import i18next from 'i18next'
 import { dirname, join } from 'path'
@@ -48,36 +55,7 @@ export const DXVK = {
       },
       {
         name: 'dxvk',
-        url: () => {
-          if (any_gpu_supports_version([1, 3, 0])) {
-            const instance_version = get_vulkan_instance_version()
-            if (
-              instance_version &&
-              semverLt(instance_version.join('.'), '1.3.0')
-            ) {
-              // FIXME: How does the instance version matter? Even with 1.2, newer DXVK seems to work fine
-              logWarning(
-                'Vulkan 1.3 is supported by GPUs in this system, but instance version is outdated',
-                LogPrefix.DXVKInstaller
-              )
-            }
-            return 'https://api.github.com/repos/doitsujin/dxvk/releases/latest'
-          }
-          if (any_gpu_supports_version([1, 1, 0])) {
-            logInfo(
-              'The GPU(s) in this system only support Vulkan 1.1/1.2, falling back to DXVK 1.10.3',
-              LogPrefix.DXVKInstaller
-            )
-            return 'https://api.github.com/repos/doitsujin/dxvk/releases/tags/v1.10.3'
-          }
-          logWarning(
-            'No GPU with Vulkan 1.1 support found, DXVK will not work',
-            LogPrefix.DXVKInstaller
-          )
-          // FIXME: We currently lack a "Don't download at all" option here, but
-          //        that would also need bigger changes in the frontend
-          return 'https://api.github.com/repos/doitsujin/dxvk/releases/latest'
-        },
+        url: getDxvkUrl(),
         extractCommand: 'tar -xf',
         os: 'linux'
       },
@@ -94,10 +72,9 @@ export const DXVK = {
         return
       }
 
-      const download_url = typeof tool.url === 'string' ? tool.url : tool.url()
       const {
         data: { assets }
-      } = await axios.get(download_url)
+      } = await axios.get(tool.url)
 
       const { name, browser_download_url: downloadUrl } = assets[0]
       const pkg = name.replace('.tar.gz', '').replace('.tar.xz', '')
@@ -507,3 +484,39 @@ export const Winetricks = {
     )
   }
 }
+
+/**
+ * Figures out the right DXVK version to use, taking the user's hardware
+ * (specifically their Vulkan support) into account
+ */
+function getDxvkUrl(): string {
+  if (!isLinux) {
+    return ''
+  }
+
+  if (any_gpu_supports_version([1, 3, 0])) {
+    const instance_version = get_vulkan_instance_version()
+    if (instance_version && semverLt(instance_version.join('.'), '1.3.0')) {
+      // FIXME: How does the instance version matter? Even with 1.2, newer DXVK seems to work fine
+      logWarning(
+        'Vulkan 1.3 is supported by GPUs in this system, but instance version is outdated',
+        LogPrefix.DXVKInstaller
+      )
+    }
+    return 'https://api.github.com/repos/doitsujin/dxvk/releases/latest'
+  }
+  if (any_gpu_supports_version([1, 1, 0])) {
+    logInfo(
+      'The GPU(s) in this system only support Vulkan 1.1/1.2, falling back to DXVK 1.10.3',
+      LogPrefix.DXVKInstaller
+    )
+    return 'https://api.github.com/repos/doitsujin/dxvk/releases/tags/v1.10.3'
+  }
+  logWarning(
+    'No GPU with Vulkan 1.1 support found, DXVK will not work',
+    LogPrefix.DXVKInstaller
+  )
+  // FIXME: We currently lack a "Don't download at all" option here, but
+  //        that would also need bigger changes in the frontend
+  return 'https://api.github.com/repos/doitsujin/dxvk/releases/latest'
+}