diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 9d9c6d3313..cf3f46365b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -1029,7 +1029,10 @@ BUSCONF fi [ "${BL_VKBRIDGE_CEF_LOG:-0}" = 1 ] && _bl_cef+=(-cef-enable-logging=stderr -cef-v=1) [ -n "${BL_VKBRIDGE_CEF_EXTRA:-}" ] && read -r -a _bl_cef_extra <<<"$BL_VKBRIDGE_CEF_EXTRA" && _bl_cef+=("${_bl_cef_extra[@]}") - export BL_WEBHELPER_ARGS="${BL_VKBRIDGE_WEBHELPER_ARGS:-stock}" + _bl_wh_args=stock + [ -n "${BL_VKBRIDGE_CEF_ANGLE:-}" ] && _bl_wh_args="--use-gl=angle --use-angle=$BL_VKBRIDGE_CEF_ANGLE" + export BL_WEBHELPER_ARGS="${BL_VKBRIDGE_WEBHELPER_ARGS:-$_bl_wh_args}" + unset _bl_wh_args echo "== steam: web helper process layout: $BL_WEBHELPER_ARGS (Mali bridge)" fi if [ "${BL_STEAM_UI:-}" != desktop ]; then diff --git a/tools/tests/test_webhelper_preload.py b/tools/tests/test_webhelper_preload.py index 30a41fc7bd..def4aa67a2 100644 --- a/tools/tests/test_webhelper_preload.py +++ b/tools/tests/test_webhelper_preload.py @@ -61,6 +61,12 @@ class WebhelperPreloadTest(unittest.TestCase): args = [WEBHELPER, "--enable-features=A"] self.assertEqual(self.argv(*args, spec="stock"), args) + def test_angle_switches_are_appended_with_the_gpu_process_kept_out_of_process(self): + out = self.argv(WEBHELPER, "-lang=en_US", "--enable-features=A", spec="--use-gl=angle --use-angle=vulkan") + self.assertEqual(out, [WEBHELPER, "-lang=en_US", "--use-gl=angle", "--use-angle=vulkan", + "--enable-features=A"]) + self.assertNotIn("--in-process-gpu", out) + def test_an_empty_setting_means_the_default(self): self.assertIn("--no-zygote", self.argv(WEBHELPER, spec=""))