Merge branch 'Boria138-fix-intel'

data_from_portwine/scripts/functions_helper

@@ -847,13 +847,6 @@ check_nvidia_rtx () {
     return 1
 }
 
-check_hybrid_graphicks () {
-    if [[ ! -z "$(echo "$LSPCI_VGA" | grep -i nvidia | grep -i -E '(intel|amd)')" ]]
-    then return 0
-    else return 1
-    fi
-}
-
 pw_init_db () {
     if [[ -f "${portwine_exe}" ]] ; then
         export PORTWINE_DB="$(basename "${portwine_exe}" .exe)"
@@ -921,7 +914,6 @@ pw_init_db () {
             check_variables PW_USE_FAKE_DLSS "0"
             check_variables PW_USE_RAY_TRACING "1"
         fi
-        check_hybrid_graphicks && check_variables PW_PRIME_RENDER_OFFLOAD "1"
     fi
     [[ "${START_FROM_STEAM}" == 1 ]] && export PW_GUI_DISABLED_CS=1
 

data_from_portwine/scripts/runlib

@@ -115,6 +115,10 @@ start_portwine () {
     fi
 
     if [[ "${PW_USE_GAMESCOPE}" == 1 ]] && command -v gamescope &>/dev/null ; then
+        # Workaround for https://gitlab.freedesktop.org/mesa/mesa/-/issues/6029
+        if grep -q "i915" <<< $(lsmod); then
+            export INTEL_DEBUG=norbc
+        fi
         if [[ ! -z "$GAMESCOPE_ARGS" ]]
         then export PW_RUN_GAMESCOPE="gamescope -o 30 ${GAMESCOPE_ARGS} --"
         else export PW_RUN_GAMESCOPE="gamescope -o 30 --"
@@ -122,7 +126,7 @@ start_portwine () {
         export PW_WINE_FULLSCREEN_FSR=0
     else
         export PW_USE_GAMESCOPE=0
-        unset PW_RUN_GAMESCOPE
+        unset PW_RUN_GAMESCOPE INTEL_DEBUG
     fi
     
     enabled_fake_nvidia_videocard () 

data_from_portwine/scripts/zen_yad_gui

@@ -166,6 +166,8 @@ pw_gui_for_edit_db () {
 
     if [[ ! -z "${PW_GPU_USE}" ]] && [[ "${PW_GPU_USE}" != "disabled" ]] ; then
         GPU_VAR="${PW_GPU_USE}"
+    elif [[ ! -z "${PW_USE_GAMESCOPE}" ]] ; then
+        GPU_VAR="disabled"
     else
         GPU_VAR="disabled"
     fi