feat: Mali Vulkan support through MaliBridge (#1950)

This commit is contained in:
张先生 authored and GitHub committed 2026-11-02 20:16:48 -05:00
1 parent c43a493ad8
commit 1f91283f40
83 files changed
+2331 -80

No files matched your search

+20
View File
@@ -57,6 +57,26 @@ class ComponentPrepareTest(unittest.TestCase):
script.write_text(script.read_text() + '\nprintf changed\n')
self.assertNotEqual(changed, components.identity('fake', self.root))
def test_identity_follows_a_submodule_commit(self):
library = self.root / 'library'
subprocess.run(['git', 'init', '-q', str(library)], check=True)
def commit(text):
(library / 'source.c').write_text(text)
subprocess.run(['git', '-C', str(library), 'add', '.'], check=True)
subprocess.run(['git', '-C', str(library), '-c', 'user.name=Test Developer', '-c', 'user.email=test@example.test',
'commit', '-qm', text], check=True)
return subprocess.check_output(['git', '-C', str(library), 'rev-parse', 'HEAD'], text=True).strip()
first = commit('int a;\n')
subprocess.run(['git', '-C', str(self.root), 'add', 'library'], check=True)
spec = dict(script='tools/components/recipes/fake.sh', inputs=['library'], outputs=[])
(self.root / components.REGISTRY).write_text(json.dumps(dict(fake=spec)))
original = components.identity('fake', self.root)
commit('int b;\n')
self.assertEqual(original, components.identity('fake', self.root))
subprocess.run(['git', '-C', str(self.root), 'add', 'library'], check=True)
self.assertNotEqual(original, components.identity('fake', self.root))
self.assertNotEqual(first, subprocess.check_output(['git', '-C', str(library), 'rev-parse', 'HEAD'], text=True).strip())
def test_tool_requirements_are_installed_in_one_union(self):
definitions = dict(one=dict(packages=['gcc', 'cmake']), two=dict(packages=['gcc', 'qemu-user']))
with patch.object(components, 'registry', return_value=definitions), patch.object(components.subprocess, 'run') as run:
+9
View File
@@ -649,6 +649,15 @@ class GameEnvironmentTest(unittest.TestCase):
self.assertEqual(evaluate(), (0, 2))
self.assertEqual(evaluate("changed"), (0, 3))
def test_the_mali_bridge_caps_the_vkd3d_feature_level(self):
bridge = {"BL_VKBRIDGE": "1", "VKD3D_FEATURE_LEVEL": "12_2"}
self.assertIn("capped", MODULE["bridge_feature_level"](bridge))
self.assertEqual(bridge["VKD3D_FEATURE_LEVEL"], "12_0")
for env in ({"BL_VKBRIDGE": "1", "VKD3D_FEATURE_LEVEL": "11_1"}, {"VKD3D_FEATURE_LEVEL": "12_2"}, {"BL_VKBRIDGE": "1"}):
before = dict(env)
self.assertIsNone(MODULE["bridge_feature_level"](env))
self.assertEqual(env, before)
def test_profile_precedence_and_unset(self):
env = {"KEEP": "inherited", "REMOVE": "inherited", "CUSTOM": "launch option"}
config = {"version": 1, "shared": {"CUSTOM": "shared"}, "games": {"42": {"REMOVE": None, "CUSTOM": "game", "EMPTY": ""}}}
+127
View File
@@ -0,0 +1,127 @@
import os
import re
import shutil
import socket
import subprocess
import tempfile
import threading
import time
import unittest
from pathlib import Path
SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-session"
def wait_functions():
text = SESSION.read_text()
found = []
for name in ("bl_now_ms", "vkbridge_wait_socket"):
match = re.search(r"^%s\(\) \{\n.*?^\}\n" % name, text, re.M | re.S)
if match:
found.append(match.group(0))
return found
class VkBridgeSocketWaitTest(unittest.TestCase):
def setUp(self):
self.root = Path(tempfile.mkdtemp())
self.addCleanup(shutil.rmtree, self.root, True)
self.sock = self.root / "vkbridge" / "server.sock"
self.sock.parent.mkdir()
self.listeners = []
self.addCleanup(lambda: [s.close() for s in self.listeners])
def listen(self):
listener = socket.socket(socket.AF_UNIX)
listener.bind(str(self.sock))
listener.listen(1)
self.listeners.append(listener)
def listen_after(self, seconds):
timer = threading.Timer(seconds, self.listen)
timer.start()
self.addCleanup(timer.cancel)
def run_wait(self, limit_ms, prelude=""):
functions = wait_functions()
self.assertEqual(2, len(functions), "droiddeck-session lacks bl_now_ms() or vkbridge_wait_socket()")
script = "set -u\n" + "".join(functions) + prelude
script += 'if vkbridge_wait_socket "$1" "$2"; then echo USABLE; else echo FALLBACK; fi\n'
started = time.monotonic()
out = subprocess.run(["bash", "-c", script, "session", str(self.sock), str(limit_ms)],
capture_output=True, text=True, timeout=30, check=True).stdout
return out, time.monotonic() - started
def waited_ms(self, out):
match = re.search(r"waited (\d+) ms|after (\d+) ms", out)
self.assertIsNotNone(match, out)
return int(match.group(1) or match.group(2))
def test_a_socket_already_listening_is_used_at_once(self):
self.listen()
out, elapsed = self.run_wait(10000)
self.assertTrue(out.endswith("USABLE\n"), out)
self.assertIn("== vkbridge: server socket ready (waited 0 ms)", out)
self.assertLess(elapsed, 2)
def test_a_server_still_probing_is_waited_for(self):
self.listen_after(0.4)
out, elapsed = self.run_wait(10000)
self.assertTrue(out.endswith("USABLE\n"), out)
self.assertIn("== vkbridge: server socket ready (waited ", out)
waited = self.waited_ms(out)
self.assertGreaterEqual(waited, 300, out)
self.assertLess(waited, 5000, out)
self.assertLess(elapsed, 6)
def test_no_server_falls_back_after_the_limit(self):
out, elapsed = self.run_wait(300)
self.assertTrue(out.endswith("FALLBACK\n"), out)
self.assertIn("== vkbridge: no server socket after ", out)
self.assertIn("(gave up at 300 ms)", out)
self.assertGreaterEqual(self.waited_ms(out), 300)
self.assertLess(elapsed, 5)
def test_a_plain_file_is_not_a_socket(self):
self.sock.write_text("stale")
out, _ = self.run_wait(200)
self.assertTrue(out.endswith("FALLBACK\n"), out)
def test_a_stopping_session_does_not_wait(self):
out, elapsed = self.run_wait(10000, prelude="bl_stopping=1\n")
self.assertTrue(out.endswith("FALLBACK\n"), out)
self.assertIn("the session is stopping", out)
self.assertLess(elapsed, 2)
def test_no_socket_path_is_a_fallback_without_waiting(self):
functions = "".join(wait_functions())
out = subprocess.run(["bash", "-c", "set -u\n" + functions +
'if vkbridge_wait_socket "" 10000; then echo USABLE; else echo FALLBACK; fi\n'],
capture_output=True, text=True, timeout=10, check=True).stdout
self.assertEqual("FALLBACK\n", out)
class VkBridgeSessionCheckTest(unittest.TestCase):
def setUp(self):
self.text = SESSION.read_text()
match = re.search(r'^if \[ "\$\{BL_VKBRIDGE:-0\}" = 1 \]; then\n.*?^fi\n', self.text, re.M | re.S)
self.assertIsNotNone(match)
self.block = match.group(0)
def test_the_first_pass_waits_before_the_usability_check(self):
wait = self.block.index("vkbridge_wait_socket")
check = self.block.index('[ -S "${VKBRIDGE_SOCKET:-}" ]')
self.assertLess(wait, check)
self.assertIn('[ -z "${BL_INSIDE:-}" ] && vkbridge_wait_socket', self.block)
def test_the_fallback_message_names_what_is_missing(self):
self.assertIn("Mali bridge requested but NOT usable", self.block)
self.assertIn("missing:$bl_vkb_missing", self.block)
def test_a_stop_ends_the_wait(self):
self.assertRegex(self.text, r"trap '[^']*bl_stopping=1[^']*' TERM INT HUP")
if __name__ == "__main__":
unittest.main()
@@ -0,0 +1,48 @@
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())
if __name__ == "__main__":
unittest.main()
+13
View File
@@ -61,6 +61,19 @@ 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_vulkan_compositing_features_join_steams_feature_list(self):
out = self.argv(WEBHELPER, "--enable-features=PlatformHEVCDecoderSupport,V4L2VideoDecode",
spec="--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan")
self.assertEqual(out, [WEBHELPER, "--use-gl=angle", "--use-angle=vulkan",
"--enable-features=PlatformHEVCDecoderSupport,V4L2VideoDecode,"
"Vulkan,VulkanFromANGLE,DefaultANGLEVulkan"])
def test_an_empty_setting_means_the_default(self):
self.assertIn("--no-zygote", self.argv(WEBHELPER, spec=""))