From d987474932ae197d0b6b1c6428b005a8fe201242 Mon Sep 17 00:00:00 2001 From: Etaash Mathamsetty Date: Thu, 14 Nov 2024 16:13:25 -0500 Subject: [PATCH 1/3] don't override winedebug with proton --- src/backend/launcher.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/backend/launcher.ts b/src/backend/launcher.ts index 37722062a0..afe70efb64 100644 --- a/src/backend/launcher.ts +++ b/src/backend/launcher.ts @@ -960,14 +960,6 @@ function setupWineEnvVars(gameSettings: GameSettings, gameId = '0') { // This sets the name of the log file given when setting PROTON_LOG=1 ret.SteamGameId = `heroic-${gameId}` ret.PROTON_LOG_DIR = flatPakHome - - // Only set WINEDEBUG if PROTON_LOG is set since Proton will also log if just WINEDEBUG is set - if ( - gameSettings?.enviromentOptions?.find((env) => env.key === 'PROTON_LOG') - ) { - // Stop Proton from overriding WINEDEBUG; this prevents logs growing to a few GB for some games - ret.WINEDEBUG = 'timestamp' - } } if (!gameSettings.preferSystemLibs && wineVersion.type === 'wine') { // https://github.com/ValveSoftware/Proton/blob/4221d9ef07cc38209ff93dbbbca9473581a38255/proton#L1091-L1093 From af1da43756eda665f9a626fe1f1c21a6d2053b5b Mon Sep 17 00:00:00 2001 From: Etaash Mathamsetty Date: Thu, 14 Nov 2024 16:34:35 -0500 Subject: [PATCH 2/3] add back default wine and dxvk logging --- src/backend/launcher.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/backend/launcher.ts b/src/backend/launcher.ts index afe70efb64..5ead1ce071 100644 --- a/src/backend/launcher.ts +++ b/src/backend/launcher.ts @@ -960,6 +960,19 @@ function setupWineEnvVars(gameSettings: GameSettings, gameId = '0') { // This sets the name of the log file given when setting PROTON_LOG=1 ret.SteamGameId = `heroic-${gameId}` ret.PROTON_LOG_DIR = flatPakHome + // add back default wine/dxvk debug logging + if (!gameSettings?.enviromentOptions.find((env) => env.key === 'WINEDEBUG')) + ret.WINEDEBUG = '+fixme' + if ( + !gameSettings?.enviromentOptions.find( + (env) => env.key === 'DXVK_LOG_LEVEL' + ) + ) + ret.DXVK_LOG_LEVEL = 'info' + if ( + !gameSettings?.enviromentOptions.find((env) => env.key === 'VKD3D_DEBUG') + ) + ret.VKD3D_DEBUG = 'fixme' } if (!gameSettings.preferSystemLibs && wineVersion.type === 'wine') { // https://github.com/ValveSoftware/Proton/blob/4221d9ef07cc38209ff93dbbbca9473581a38255/proton#L1091-L1093 From f2203c38f7ccde38146084ee6e372e59cc42e65a Mon Sep 17 00:00:00 2001 From: Etaash Mathamsetty Date: Mon, 3 Mar 2025 22:31:13 -0500 Subject: [PATCH 3/3] check verboseLogs setting --- src/backend/launcher.ts | 28 +++++++++++++++++----------- src/backend/logger/logger.ts | 2 +- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/backend/launcher.ts b/src/backend/launcher.ts index 5ead1ce071..8bc00036d6 100644 --- a/src/backend/launcher.ts +++ b/src/backend/launcher.ts @@ -961,18 +961,24 @@ function setupWineEnvVars(gameSettings: GameSettings, gameId = '0') { ret.SteamGameId = `heroic-${gameId}` ret.PROTON_LOG_DIR = flatPakHome // add back default wine/dxvk debug logging - if (!gameSettings?.enviromentOptions.find((env) => env.key === 'WINEDEBUG')) - ret.WINEDEBUG = '+fixme' - if ( - !gameSettings?.enviromentOptions.find( - (env) => env.key === 'DXVK_LOG_LEVEL' + if (gameSettings?.verboseLogs) { + if ( + !gameSettings?.enviromentOptions.find((env) => env.key === 'WINEDEBUG') ) - ) - ret.DXVK_LOG_LEVEL = 'info' - if ( - !gameSettings?.enviromentOptions.find((env) => env.key === 'VKD3D_DEBUG') - ) - ret.VKD3D_DEBUG = 'fixme' + ret.WINEDEBUG = '+fixme' + if ( + !gameSettings?.enviromentOptions.find( + (env) => env.key === 'DXVK_LOG_LEVEL' + ) + ) + ret.DXVK_LOG_LEVEL = 'info' + if ( + !gameSettings?.enviromentOptions.find( + (env) => env.key === 'VKD3D_DEBUG' + ) + ) + ret.VKD3D_DEBUG = 'fixme' + } } if (!gameSettings.preferSystemLibs && wineVersion.type === 'wine') { // https://github.com/ValveSoftware/Proton/blob/4221d9ef07cc38209ff93dbbbca9473581a38255/proton#L1091-L1093 diff --git a/src/backend/logger/logger.ts b/src/backend/logger/logger.ts index aa87eb96e5..66061069e5 100644 --- a/src/backend/logger/logger.ts +++ b/src/backend/logger/logger.ts @@ -90,7 +90,7 @@ export function initLogger() { if (logsDisabled) { logWarning( - 'IMPORTANT: Logs are disabled. Enable logs before reporting any issue.', + 'IMPORTANT: Logs are disabled. Enable logs before reporting any issue.\n', { forceLog: true }