diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index fbea003241..bbfe862b1d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -1538,6 +1538,9 @@ case $mode in _bl_cef=(-cef-disable-gpu -cef-disable-gpu-compositing) echo "== steam: browser UI in software (Mali bridge)" elif [ "${_bl_cef[0]}" = -cef-force-gpu ]; then + # With Steam's own web helper layout the Deck UI's footer and overlays flicker on the bridge + # (Mali-G78 MP14). ANGLE on Vulkan without Chromium's Vulkan compositing draws them steadily. + : "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}" _bl_cef=(-cef-force-gpu -cef-use-gl=angle -cef-use-angle="${BL_VKBRIDGE_CEF_ANGLE:-vulkan}") fi [ "${BL_VKBRIDGE_CEF_LOG:-0}" = 1 ] && _bl_cef+=(-cef-enable-logging=stderr -cef-v=1) diff --git a/tools/tests/test_session_webhelper_layout.py b/tools/tests/test_session_webhelper_layout.py index f14afd61da..0a6ba0b27f 100644 --- a/tools/tests/test_session_webhelper_layout.py +++ b/tools/tests/test_session_webhelper_layout.py @@ -43,6 +43,34 @@ class WebhelperLayoutTest(unittest.TestCase): def test_the_steam_block_uses_it(self): self.assertIn("BL_WEBHELPER_ARGS=$(bl_webhelper_layout)", SESSION.read_text()) + def test_the_gpu_ui_on_the_bridge_defaults_to_angle_on_vulkan_without_vulkan_compositing(self): + text = SESSION.read_text() + gpu = text.index('elif [ "${_bl_cef[0]}" = -cef-force-gpu ]; then') + software = text.rindex('_bl_cef=(-cef-disable-gpu -cef-disable-gpu-compositing)', 0, gpu) + defaults = text.index(': "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}"', gpu) + self.assertLess(software, gpu) + self.assertLess(defaults, text.index("BL_WEBHELPER_ARGS=$(bl_webhelper_layout)", gpu)) + self.assertLess(defaults, text.index("\n fi\n", gpu)) + + def test_the_defaults_give_way_to_settings(self): + script = ': "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}"\n' + layout_function() + "bl_webhelper_layout\n" + env = {k: v for k, v in os.environ.items() if k not in KEYS} + run = lambda **s: subprocess.run(["bash", "-c", "set -u\n" + script], env={**env, **s}, + capture_output=True, text=True, check=True).stdout.strip() + self.assertEqual(run(), "--use-gl=angle --use-angle=vulkan") + self.assertEqual(run(BL_VKBRIDGE_CEF_VULKAN="1"), + "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") + self.assertEqual(run(BL_VKBRIDGE_CEF_ANGLE="gl"), "--use-gl=angle --use-angle=gl") + + def test_empty_settings_are_kept_as_set(self): + script = ': "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}"\n' + layout_function() + "bl_webhelper_layout\n" + env = {k: v for k, v in os.environ.items() if k not in KEYS} + run = lambda **s: subprocess.run(["bash", "-c", "set -u\n" + script], env={**env, **s}, + capture_output=True, text=True, check=True).stdout.strip() + self.assertEqual(run(BL_VKBRIDGE_CEF_ANGLE=""), "stock") + self.assertEqual(run(BL_VKBRIDGE_CEF_VULKAN=""), + "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") + if __name__ == "__main__": unittest.main()