mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 20:36:04 +00:00
* fix(session): the Steam UI on the Mali bridge stops flickering On the Mali bridge Steam's own web helper layout makes the Deck UI footer and overlays flicker (Mali-G78 MP14). When the browser UI is on the GPU, default to ANGLE on Vulkan without Chromium's Vulkan compositing. Values set by the user still win, and the software UI path is unchanged. * fix(session): keep empty Mali bridge CEF settings as set
77 lines
4.0 KiB
Python
77 lines
4.0 KiB
Python
import os
|
|
import re
|
|
import subprocess
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-session"
|
|
KEYS = ("BL_VKBRIDGE_WEBHELPER_ARGS", "BL_VKBRIDGE_CEF_ANGLE", "BL_VKBRIDGE_CEF_VULKAN")
|
|
|
|
|
|
def layout_function():
|
|
match = re.search(r"^bl_webhelper_layout\(\) \{\n.*?^\}\n", SESSION.read_text(), re.M | re.S)
|
|
return match.group(0) if match else None
|
|
|
|
|
|
class WebhelperLayoutTest(unittest.TestCase):
|
|
def layout(self, **settings):
|
|
function = layout_function()
|
|
self.assertIsNotNone(function, "droiddeck-session lacks bl_webhelper_layout()")
|
|
env = {k: v for k, v in os.environ.items() if k not in KEYS}
|
|
env.update(settings)
|
|
return subprocess.run(["bash", "-c", "set -u\n" + function + "bl_webhelper_layout\n"], env=env,
|
|
capture_output=True, text=True, check=True).stdout.strip()
|
|
|
|
def test_unset_keeps_steams_own_layout(self):
|
|
self.assertEqual(self.layout(), "stock")
|
|
|
|
def test_angle_on_vulkan_brings_chromiums_vulkan_compositing(self):
|
|
self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="vulkan"),
|
|
"--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan")
|
|
|
|
def test_vulkan_compositing_can_be_left_off(self):
|
|
self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="vulkan", BL_VKBRIDGE_CEF_VULKAN="0"),
|
|
"--use-gl=angle --use-angle=vulkan")
|
|
|
|
def test_other_angle_backends_get_only_the_angle_switches(self):
|
|
self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="gl"), "--use-gl=angle --use-angle=gl")
|
|
|
|
def test_explicit_layout_wins(self):
|
|
self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="vulkan", BL_VKBRIDGE_WEBHELPER_ARGS="--x +Y"),
|
|
"--x +Y")
|
|
|
|
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()
|