Merge GPU preference feature branch to main branch version 2.0.2 for testing (#3)

* modernized UI for GPU Preference option

* feat: auto-detect dedicated GPU on hybrid laptops (iGPU+dGPU)

* feat: detailed GPU info in auto-detection feature on startup

* feat: add GPU options for launcher

- Add GPU preference setting (Auto/Integrated/Dedicated)
- Implement Linux GPU selection with DRI_PRIME and NVIDIA env vars
- Add GPU detection using Electron's app.getGPUInfo()
- Update settings UI with GPU preference dropdown
- Integrate GPU preference into game launch process

* feat: auto-detect dedicated GPU on hybrid laptops (iGPU+dGPU)

* added fallbacks to and option to use integrated GPU.

* add package-lock and fix deps version

* changed 'Nvidia' string to 'NVIDIA'

* fix: selecting `dedicated` option while using nvidia GPU did not set its specific env variables

* remove unused `CONFIG_FILE` variable on launcher core modules

* fix: duplicated save-load gpu detection functions

* move game option settings to the top, while custom java to the bottom

* fix: settings-header margin-bottom from 3rem to 1rem and supress line-clamp warning

backend/core/config.js

@@ -277,6 +277,15 @@ function loadChatColor() {
   return config.chatColor || '#3498db';
 }
 
+function saveGpuPreference(gpuPreference) {
+  saveConfig({ gpuPreference: gpuPreference || 'auto' });
+}
+
+function loadGpuPreference() {
+  const config = loadConfig();
+  return config.gpuPreference || 'auto';
+}
+
 module.exports = {
   loadConfig,
   saveConfig,
@@ -308,5 +317,8 @@ module.exports = {
   setUuidForUser,
   generateNewUuid,
   deleteUuidForUser,
-  resetCurrentUserUuid
+  resetCurrentUserUuid,
+  // GPU Preference exports
+  saveGpuPreference,
+  loadGpuPreference
 };

backend/launcher.js

@@ -20,14 +20,16 @@ const {
   getUuidForUser,
   isFirstLaunch,
   markAsLaunched,
-  CONFIG_FILE,
   // UUID Management
   getCurrentUuid,
   getAllUuidMappings,
   setUuidForUser,
   generateNewUuid,
   deleteUuidForUser,
-  resetCurrentUserUuid
+  resetCurrentUserUuid,
+  // GPU Preference
+  saveGpuPreference,
+  loadGpuPreference
 } = require('./core/config');
 
 const { getResolvedAppDir, getModsPath } = require('./core/paths');
@@ -77,6 +79,9 @@ const {
   handleFirstLaunchCheck
 } = require('./services/firstLaunch');
 
+// Utils
+const { detectGpu } = require('./utils/platformUtils');
+
 // Re-export all functions to maintain backward compatibility
 module.exports = {
   // Game launch functions
@@ -111,6 +116,11 @@ module.exports = {
   saveDiscordRPC,
   loadDiscordRPC,
   
+  // GPU Preference functions
+  saveGpuPreference,
+  loadGpuPreference,
+  detectGpu,
+  
   // Version functions
   getInstalledClientVersion,
   getLatestClientVersion,
@@ -150,7 +160,7 @@ module.exports = {
   checkExistingGameInstallation,
   proposeGameUpdate,
   handleFirstLaunchCheck,
-  
+
   // Path functions
   getResolvedAppDir
 };

backend/managers/gameLauncher.js

@@ -6,7 +6,7 @@ const { promisify } = require('util');
 const { spawn } = require('child_process');
 const { v4: uuidv4 } = require('uuid');
 const { getResolvedAppDir, findClientPath } = require('../core/paths');
-const { setupWaylandEnvironment } = require('../utils/platformUtils');
+const { setupWaylandEnvironment, setupGpuEnvironment } = require('../utils/platformUtils');
 const { saveUsername, saveInstallPath, loadJavaPath, getUuidForUser, getAuthServerUrl, getAuthDomain } = require('../core/config');
 const { resolveJavaPath, getJavaExec, getBundledJavaPath, detectSystemJava, JAVA_EXECUTABLE } = require('./javaManager');
 const { getInstalledClientVersion, getLatestClientVersion } = require('../services/versionManager');
@@ -101,7 +101,7 @@ function generateLocalTokens(uuid, name) {
   };
 }
 
-async function launchGame(playerName = 'Player', progressCallback, javaPathOverride, installPathOverride) {
+async function launchGame(playerName = 'Player', progressCallback, javaPathOverride, installPathOverride, gpuPreference = 'auto') {
   const customAppDir = getResolvedAppDir(installPathOverride);
   const customGameDir = path.join(customAppDir, 'release', 'package', 'game', 'latest');
   const customJreDir = path.join(customAppDir, 'release', 'package', 'jre', 'latest');
@@ -276,10 +276,13 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
   console.log('Starting game...');
   console.log(`Command: "${clientPath}" ${args.join(' ')}`);
 
-  const env = { ...process.env };
+   const env = { ...process.env };
 
-  const waylandEnv = setupWaylandEnvironment();
-  Object.assign(env, waylandEnv);
+   const waylandEnv = setupWaylandEnvironment();
+   Object.assign(env, waylandEnv);
+
+   const gpuEnv = setupGpuEnvironment(gpuPreference);
+   Object.assign(env, gpuEnv);
 
   try {
     let spawnOptions = {
@@ -352,7 +355,7 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
   }
 }
 
-async function launchGameWithVersionCheck(playerName = 'Player', progressCallback, javaPathOverride, installPathOverride) {
+async function launchGameWithVersionCheck(playerName = 'Player', progressCallback, javaPathOverride, installPathOverride, gpuPreference = 'auto') {
   try {
     if (progressCallback) {
       progressCallback('Checking for updates...', 0, null, null, null);
@@ -403,7 +406,7 @@ async function launchGameWithVersionCheck(playerName = 'Player', progressCallbac
       progressCallback('Launching game...', 80, null, null, null);
     }
 
-    return await launchGame(playerName, progressCallback, javaPathOverride, installPathOverride);
+    return await launchGame(playerName, progressCallback, javaPathOverride, installPathOverride, gpuPreference);
   } catch (error) {
     console.error('Error in version check and launch:', error);
     if (progressCallback) {

backend/utils/platformUtils.js

@@ -65,9 +65,100 @@ function setupWaylandEnvironment() {
   return envVars;
 }
 
+function detectGpu() {
+  if (process.platform !== 'linux') {
+    return { mode: 'integrated', vendor: 'intel', integratedName: 'Unknown', dedicatedName: null };
+  }
+
+  try {
+    const output = execSync('lspci -nn | grep \'VGA\\|3D\'', { encoding: 'utf8' });
+    // console.log('GPU detection raw output:', output);
+    const lines = output.split('\n').filter(line => line.trim());
+    // console.log('GPU detection parsed lines:', lines);
+
+    let integratedName = null;
+    let dedicatedName = null;
+    let hasNvidia = false;
+    let hasAmd = false;
+
+    for (const line of lines) {
+      // console.log('Checking line:', line);
+      if (line.includes('VGA') || line.includes('3D')) {
+        // console.log('Line contains VGA or 3D');
+
+        const match = line.match(/\[([^\]]+)\]/g);
+        let modelName = null;
+        if (match && match.length >= 2) {
+          modelName = match[1].slice(1, -1);
+        }
+
+        if (line.includes('10de:') || line.toLowerCase().includes('nvidia')) {
+          hasNvidia = true;
+          dedicatedName = "NVIDIA " + modelName || 'NVIDIA GPU';
+          console.log('Detected NVIDIA GPU:', dedicatedName);
+        } else if (line.includes('1002:') || line.toLowerCase().includes('amd') || line.toLowerCase().includes('radeon')) {
+          hasAmd = true;
+          dedicatedName = "AMD " + modelName || 'AMD GPU';
+          console.log('Detected AMD GPU:', dedicatedName);
+        } else if (line.includes('8086:') || line.toLowerCase().includes('intel')) {
+          integratedName = "Intel " + modelName || 'Intel GPU';
+          console.log('Detected Intel GPU:', integratedName);
+        }
+      }
+    }
+
+    // console.log('hasNvidia:', hasNvidia, 'hasAmd:', hasAmd, 'integratedName:', integratedName, 'dedicatedName:', dedicatedName);
+
+    if (hasNvidia) {
+      return { mode: 'dedicated', vendor: 'nvidia', integratedName: integratedName || 'Intel GPU', dedicatedName };
+    } else if (hasAmd) {
+      return { mode: 'dedicated', vendor: 'amd', integratedName: integratedName || 'Intel GPU', dedicatedName };
+    } else {
+      return { mode: 'integrated', vendor: 'intel', integratedName: integratedName || 'Intel GPU', dedicatedName: null };
+    }
+  } catch (error) {
+    console.warn('GPU detection failed, falling back to integrated:', error.message);
+    return { mode: 'integrated', vendor: 'intel', integratedName: 'Unknown', dedicatedName: null };
+  }
+}
+
+function setupGpuEnvironment(gpuPreference) {
+  if (process.platform !== 'linux') {
+    return {};
+  }
+
+  let finalPreference = gpuPreference;
+  let detected = detectGpu();
+
+  if (gpuPreference === 'auto') {
+    finalPreference = detected.mode;
+    console.log(`Auto-detected GPU: ${detected.vendor} (${detected.mode})`);
+  }
+
+  console.log('Preferred GPU set to:', finalPreference);
+
+  const envVars = {};
+
+  if (finalPreference === 'dedicated') {
+    envVars.DRI_PRIME = '1';
+    if (detected.vendor === 'nvidia') {
+      envVars.__NV_PRIME_RENDER_OFFLOAD = '1';
+      envVars.__GLX_VENDOR_LIBRARY_NAME = 'nvidia';
+      envVars.__GL_SHADER_DISK_CACHE = '1';
+      envVars.__GL_SHADER_DISK_CACHE_PATH = '/tmp';
+    }
+    console.log('GPU environment variables:', envVars);
+  } else {
+    console.log('Using integrated GPU, no environment variables set');
+  }
+  return envVars;
+}
+
 module.exports = {
   getOS,
   getArch,
   isWaylandSession,
-  setupWaylandEnvironment
+  setupWaylandEnvironment,
+  detectGpu,
+  setupGpuEnvironment
 };