mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 22:05:59 +00:00
Experimental Samsung Xclipse support on the system Vulkan path
Detect Samsung's Vulkan HAL (vulkan.samsung.so) and its sgpu render node alongside PowerVR, and run Xclipse through the same libhybris bridge: - VK_LAYER_DROIDDECK_xclipse (tools/linuxfs/xclipse-layer), built with the glibc preloads and enabled only on Xclipse: sets bionic's environ for the driver's shader compiler, avoids immutable YCbCr samplers in compute layouts, forwards the KHR calibrated-timestamp entry points to the EXT ones, and reports textureCompressionBC and BC4/BC5 filtering over the compat layer's BC emulation. - Upstream DXVK 2.6.2, pinned as a tar.gz component and selected on Xclipse: the driver has 128 bytes of push constants, DXVK 3 needs 256. - android_wlegl accepts a zero stride and passes it through unchanged: Samsung's gralloc records none for GPU-only buffers. Tested on a Galaxy A56 (Xclipse 540, driver 24.0.560): Steam Big Picture and PICO PARK (D3D9).
This commit is contained in:
1 parent
d33715ca8a
commit
b93141b757
21 files changed
+793
-30
No files matched your search
@@ -82,6 +82,32 @@ class SystemGraphicsLaunchTest(unittest.TestCase):
|
||||
for key in ("FEX_TSOENABLED", "WINESERVER", "CUSTOM"):
|
||||
self.assertEqual(result[key], env[key])
|
||||
|
||||
def test_xclipse_selection_adds_its_layers_layer_path_and_dxvk_payload(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
runtime, _ = self.runtime(Path(tmp))
|
||||
env = {"DROIDDECK_POWERVR_RUNTIME": str(runtime), "STEAM_COMPAT_DATA_PATH": "/compatdata/42",
|
||||
"DROIDDECK_HYBRIS_LAYERS": "VK_LAYER_DROIDDECK_xclipse:VK_LAYER_HYBRIS_compat",
|
||||
"DROIDDECK_HYBRIS_LAYER_PATH": "/usr/local/lib/droiddeck-xclipse",
|
||||
"DROIDDECK_HYBRIS_DXVK": "dxvk-2.6.2"}
|
||||
command = ["/proton", "waitforexitandrun", "game.exe"]
|
||||
# The selected payload is required like the default one.
|
||||
with self.assertRaises(MODULE["SystemGraphicsError"]):
|
||||
MODULE["system_graphics_launch"](command, env)
|
||||
for arch in ("x32", "x64"):
|
||||
for name in ("d3d8", "d3d9", "d3d10core", "d3d11", "dxgi"):
|
||||
target = runtime / "dxvk-2.6.2" / arch / (name + ".dll")
|
||||
target.parent.mkdir(parents=True, exist_ok=True)
|
||||
target.write_bytes(b"component")
|
||||
launch, result = MODULE["system_graphics_launch"](command, env)
|
||||
self.assertEqual(launch, [str(runtime / "run-proton.py"), *command])
|
||||
self.assertEqual(result["VK_INSTANCE_LAYERS"],
|
||||
"VK_LAYER_window_system_integration:VK_LAYER_DROIDDECK_xclipse:VK_LAYER_HYBRIS_compat")
|
||||
self.assertEqual(result["VK_LAYER_PATH"], f"{runtime}/wsi:{runtime}/lib:/usr/local/lib/droiddeck-xclipse")
|
||||
self.assertEqual(result["DROIDDECK_HYBRIS_DXVK"], "dxvk-2.6.2")
|
||||
for name in ("../dxvk", "other", "dxvk/x"):
|
||||
with self.subTest(name=name), self.assertRaises(MODULE["SystemGraphicsError"]):
|
||||
MODULE["system_graphics_launch"](command, dict(env, DROIDDECK_HYBRIS_DXVK=name))
|
||||
|
||||
def test_incomplete_runtime_fails_before_any_proton_exec(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
runtime, files = self.runtime(Path(tmp))
|
||||
|
||||
@@ -48,6 +48,29 @@ def tar(entries):
|
||||
capture_output=True, check=True).stdout
|
||||
|
||||
|
||||
def tar_gz(entries):
|
||||
stream = io.BytesIO()
|
||||
with tarfile.open(fileobj=stream, mode='w:gz') as archive:
|
||||
for name, kind, content in entries:
|
||||
info = tarfile.TarInfo(name)
|
||||
info.type = kind
|
||||
if kind == tarfile.SYMTYPE:
|
||||
info.linkname = content
|
||||
archive.addfile(info)
|
||||
elif kind == tarfile.REGTYPE:
|
||||
info.size = len(content)
|
||||
archive.addfile(info, io.BytesIO(content))
|
||||
else:
|
||||
archive.addfile(info)
|
||||
return stream.getvalue()
|
||||
|
||||
|
||||
def upstream_dxvk(version, architecture_of=lambda arch: arch):
|
||||
return {'dxvk-%s/%s/%s' % (version, arch, name): pe(architecture_of(arch))
|
||||
for arch in ('x32', 'x64')
|
||||
for name in ('d3d8.dll', 'd3d9.dll', 'd3d10core.dll', 'd3d11.dll', 'dxgi.dll')}
|
||||
|
||||
|
||||
class PowerVRRuntimeTest(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.temporary = tempfile.TemporaryDirectory()
|
||||
@@ -95,6 +118,18 @@ class PowerVRRuntimeTest(unittest.TestCase):
|
||||
(self.cache / (component['sha256'] + '-' + name)).write_bytes(data)
|
||||
return component
|
||||
|
||||
def add_upstream_dxvk(self, files):
|
||||
top = next(iter(files)).split('/')[0]
|
||||
data = tar_gz([(top, tarfile.DIRTYPE, None)] +
|
||||
[(name, tarfile.REGTYPE, content) for name, content in files.items()])
|
||||
component = self.component('dxvk-upstream.tar.gz', data)
|
||||
component.update({'format': 'tar.gz', 'ignored': [], 'files': [
|
||||
{'name': name, 'path': name, 'size': len(content), 'sha256': runtime.sha256(content), 'mode': 0o755}
|
||||
for name, content in files.items()]})
|
||||
self.release['archives'].append(component)
|
||||
self.pins.write_bytes(runtime.json_bytes(self.release))
|
||||
return component
|
||||
|
||||
def assembled(self):
|
||||
runtime.assemble(self.root, self.cache)
|
||||
return runtime.read_tar((self.root / runtime.ASSETS / 'runtime.tzst').read_bytes())
|
||||
@@ -107,6 +142,38 @@ class PowerVRRuntimeTest(unittest.TestCase):
|
||||
self.assertEqual(first, (self.root / runtime.ASSETS / 'runtime.tzst').read_bytes())
|
||||
self.assertEqual(runtime.read_tar(first)['lib/libhybris-common.so.1'][0], 'symlink')
|
||||
|
||||
def test_upstream_tarball_adds_a_second_dxvk_payload(self):
|
||||
files = upstream_dxvk('2.6.2')
|
||||
self.add_upstream_dxvk(files)
|
||||
entries = self.assembled()
|
||||
runtime.verify(self.root)
|
||||
for name, content in files.items():
|
||||
self.assertEqual(entries[name], ('file', 0o755, content))
|
||||
self.assertIn('dxvk/x64/d3d9.dll', entries)
|
||||
|
||||
def test_second_dxvk_payload_with_wrong_pe_architecture_is_rejected(self):
|
||||
self.add_upstream_dxvk(upstream_dxvk('2.6.2', lambda arch: 'x64' if arch == 'x32' else 'x32'))
|
||||
with self.assertRaisesRegex(ValueError, 'wrong PE architecture: dxvk-2.6.2/'):
|
||||
self.assembled()
|
||||
|
||||
def test_tar_gz_rejects_symlinks_unknown_members_and_changed_files(self):
|
||||
pin = {'name': 'dxvk-1/x64/d3d9.dll', 'path': 'dxvk-1/x64/d3d9.dll', 'size': 4,
|
||||
'sha256': runtime.sha256(b'good'), 'mode': 0o755}
|
||||
component = {'files': [pin], 'ignored': []}
|
||||
cases = [
|
||||
[('dxvk-1/x64/d3d9.dll', tarfile.SYMTYPE, '../../outside')],
|
||||
[('dxvk-1/x64/d3d9.dll', tarfile.REGTYPE, b'good'), ('dxvk-1/extra.dll', tarfile.REGTYPE, b'x')],
|
||||
[('dxvk-1/x64/d3d9.dll', tarfile.REGTYPE, b'evil')],
|
||||
[],
|
||||
]
|
||||
for entries in cases:
|
||||
with self.subTest(entries=[name for name, _, _ in entries]), self.assertRaises(ValueError):
|
||||
runtime.read_tar_gz(tar_gz(entries), component)
|
||||
self.assertEqual(runtime.read_tar_gz(tar_gz([('dxvk-1/x64/d3d9.dll', tarfile.REGTYPE, b'good')]), component),
|
||||
{'dxvk-1/x64/d3d9.dll': ('file', 0o755, b'good')})
|
||||
with self.assertRaisesRegex(ValueError, 'unsupported component archive format'):
|
||||
runtime.read_component(b'', {'format': 'rar'})
|
||||
|
||||
def test_stale_wrapper_cannot_pass_with_an_updated_archive_checksum(self):
|
||||
self.assembled()
|
||||
(self.root / 'tools/hybris/run-proton.py').write_text('print("new wrapper")\n')
|
||||
|
||||
@@ -89,7 +89,7 @@ class ProtonWrapperTest(unittest.TestCase):
|
||||
return {"wrapper": wrapper, "dxvk": dxvk, "depot": depot, "proton": proton,
|
||||
"probe": root / "proton-ran.json"}
|
||||
|
||||
def run_wrapper(self, fixture, *proton_args, check=False, exit_status=0):
|
||||
def run_wrapper(self, fixture, *proton_args, check=False, exit_status=0, env=None):
|
||||
command = [sys.executable, str(fixture["wrapper"])]
|
||||
if check:
|
||||
command.append("--check")
|
||||
@@ -98,7 +98,7 @@ class ProtonWrapperTest(unittest.TestCase):
|
||||
command,
|
||||
cwd=fixture["wrapper"].parent,
|
||||
env={"PATH": os.defpath, "PROBE": str(fixture["probe"]),
|
||||
"PROTON_EXIT": str(exit_status)},
|
||||
"PROTON_EXIT": str(exit_status), **(env or {})},
|
||||
text=True,
|
||||
capture_output=True,
|
||||
)
|
||||
@@ -126,6 +126,36 @@ class ProtonWrapperTest(unittest.TestCase):
|
||||
{name: f"{architecture}:{name}" for name in DLL_NAMES},
|
||||
)
|
||||
|
||||
def test_named_sibling_payload_replaces_the_default(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
fixture = self.fixture(Path(tmp))
|
||||
for architecture in ("x32", "x64"):
|
||||
payload = fixture["wrapper"].parent / "dxvk-2.6.2" / architecture
|
||||
payload.mkdir(parents=True)
|
||||
for name in DLL_NAMES:
|
||||
(payload / name).write_text(f"2.6.2 {architecture}:{name}")
|
||||
result = self.run_wrapper(fixture, "waitforexitandrun", "game.exe",
|
||||
env={"DROIDDECK_HYBRIS_DXVK": "dxvk-2.6.2"})
|
||||
|
||||
self.assertEqual(result.returncode, 0, result.stderr)
|
||||
record = json.loads(fixture["probe"].read_text())
|
||||
for architecture in ("x32", "x64"):
|
||||
self.assertEqual(
|
||||
record["payloads"][architecture],
|
||||
{name: f"2.6.2 {architecture}:{name}" for name in DLL_NAMES},
|
||||
)
|
||||
|
||||
def test_payload_names_outside_the_wrapper_directory_are_refused(self):
|
||||
for name in ("../dxvk", "dxvk/../../x", "/tmp/dxvk", "other", ".dxvk"):
|
||||
with self.subTest(name=name), tempfile.TemporaryDirectory() as tmp:
|
||||
fixture = self.fixture(Path(tmp))
|
||||
result = self.run_wrapper(fixture, "waitforexitandrun", "game.exe",
|
||||
env={"DROIDDECK_HYBRIS_DXVK": name})
|
||||
|
||||
self.assertEqual(result.returncode, 1)
|
||||
self.assertIn("invalid payload name", result.stderr)
|
||||
self.assertFalse(fixture["probe"].exists())
|
||||
|
||||
def test_check_validates_without_executing_proton(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
fixture = self.fixture(Path(tmp))
|
||||
|
||||
Reference in new issue
Block a user