diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index a8d9ccd0a6..f584f69ba4 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1349,6 +1349,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { // Turnip, not the system Adreno driver: importing the dma-bufs gamescope commits needs // VK_EXT_image_drm_format_modifier, which the system driver does not implement. val turnip = TurnipDriver(this) + com.droiddeck.launcher.gpu.DriverSetupLog.write(this, "surface.driver-setup") val driverId = if (CompositorHost.isStarted) null else turnip.install() // The output size belongs to the session, not to the Surface: gamescope's display is @@ -1417,6 +1418,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { ) Log.i(TAG, "hdr: " + (if (on) "on" else if (wanted) "wanted but ${probe.reason}" else "off") + " ยท display ${probe.formats.ifEmpty { "SDR" }}") } + com.droiddeck.launcher.gpu.DriverSetupLog.write(this, "compositor.start driver=$driverId") CompositorHost.startOrAttach( holder.surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/DriverSetupLog.java b/app/src/main/java/com/droiddeck/launcher/gpu/DriverSetupLog.java new file mode 100644 index 0000000000..00aca26a50 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/gpu/DriverSetupLog.java @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.gpu; + +import android.content.Context; +import android.util.Log; +import java.io.File; +import java.io.FileWriter; + +/** Setup breadcrumbs survive failures before a session log exists. No account data. */ +public final class DriverSetupLog { + private DriverSetupLog() {} + + public static synchronized void write(Context context, String stage) { + Log.i("DriverSetup", stage); + append(context.getFilesDir(), stage); + try { append(context.getExternalFilesDir(null), stage); } + catch (Exception ignored) { /* External storage is optional. */ } + } + + private static void append(File directory, String stage) { + if (directory == null) return; + try { + directory.mkdirs(); + File file = new File(directory, "driver-setup.txt"); + // Keep the latest run's breadcrumbs bounded across repeated attempts. + try (FileWriter out = new FileWriter(file, file.length() < 131072)) { + out.write(System.currentTimeMillis() + " " + stage + "\n"); + } + } catch (Exception ignored) { /* Diagnostics must never prevent startup. */ } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java index 27083a544a..c125b531c5 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java @@ -45,13 +45,16 @@ import java.util.zip.ZipInputStream; */ public final class TurnipDriver { private static final String TAG = "TurnipDriver"; + /** Pinned A6xx/A7xx upstream build; used as the A6xx offline fallback. */ + private static final String DRIVER_A6XX = "turnip26.3.0-a6xx"; /** Adreno 7xx (8 Gen 2/3, e.g. the Pocket FIT's A750). */ private static final String DRIVER_A7XX = "turnip25.1.0"; /** Adreno 8xx (8 Elite, e.g. a Fold 8's A830). */ private static final String DRIVER_A8XX = "turnip-sdk36"; /** The two the apk carries; never removable, unpacked on demand. */ public static final List BUNDLED = Collections.unmodifiableList(Arrays.asList( - DRIVER_A7XX, DRIVER_A8XX, com.droiddeck.launcher.session.QuestExperimental.DRIVER)); + DRIVER_A7XX, DRIVER_A8XX, com.droiddeck.launcher.session.QuestExperimental.DRIVER, + DRIVER_A6XX, com.droiddeck.launcher.session.QuestExperimental.DRIVER_A6XX)); /** Overrides the pick, for a device we cannot reach: a7xx, a8xx or system. */ private static final String OVERRIDE_FILE = "Download/droiddeck-driver"; /** Bundled drivers the user deleted: hidden from the list, their unpacked copy removed. */ @@ -289,12 +292,14 @@ public final class TurnipDriver { */ public String install() { String id = choose(); + DriverSetupLog.write(context, "install.begin driver=" + id); if (id == null) return null; File dir = new File(contentDir, id); if (!new File(dir, "meta.json").isFile()) { FileUtils.delete(dir); if (!TarZst.extractAsset(context, "graphics_driver/adrenotools-" + id + ".tzst", dir)) { Log.e(TAG, "could not unpack " + id); + DriverSetupLog.write(context, "install.unpack-failed driver=" + id); FileUtils.delete(dir); return null; } @@ -305,6 +310,7 @@ public final class TurnipDriver { return null; } Log.i(TAG, "graphics driver " + id + " (" + library + ")"); + DriverSetupLog.write(context, "install.ready driver=" + id + " library=" + library); return id; } @@ -338,6 +344,7 @@ public final class TurnipDriver { if (forced.startsWith("system")) return null; if (forced.startsWith("a8")) return DRIVER_A8XX; if (forced.startsWith("a7")) return DRIVER_A7XX; + if (forced.startsWith("a6")) return DRIVER_A6XX; } String model = gpuModel(); Log.i(TAG, "gpu model: " + (model == null ? "unknown" : model)); @@ -348,6 +355,7 @@ public final class TurnipDriver { char generation = m.group(1).charAt(0); if (generation >= '8') return DRIVER_A8XX; if (generation == '7') return DRIVER_A7XX; + if (generation == '6') return DRIVER_A6XX; } } // Nothing to go on: Android 16 shipped with the 8 Elite, so treat a new device as 8xx. diff --git a/app/src/main/java/com/droiddeck/launcher/session/QuestExperimental.kt b/app/src/main/java/com/droiddeck/launcher/session/QuestExperimental.kt index a58bb7f937..089f0631ca 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/QuestExperimental.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/QuestExperimental.kt @@ -10,29 +10,36 @@ import java.io.File object QuestExperimental { private const val TAG = "QuestExperimental" const val DRIVER = "turnip25.1.0-quest1" + const val DRIVER_A6XX = "turnip26.3.0-quest2" + + internal fun quest2(model: String, device: String, manufacturer: String): Boolean = + model.equals("Quest 2", ignoreCase = true) || + ((manufacturer.equals("Oculus", ignoreCase = true) || manufacturer.equals("Meta", ignoreCase = true)) && + device == "hollywood") - // Quest 2 has an A6xx GPU and cannot use this bundled A7xx driver. internal fun supported(model: String, device: String, manufacturer: String): Boolean = - model.equals("Quest 3", ignoreCase = true) || model.equals("Quest 3S", ignoreCase = true) || + quest2(model, device, manufacturer) || model.equals("Quest 3", ignoreCase = true) || model.equals("Quest 3S", ignoreCase = true) || ((manufacturer.equals("Oculus", ignoreCase = true) || manufacturer.equals("Meta", ignoreCase = true)) && (device == "eureka" || device == "panther")) fun isSupported(): Boolean = supported(Build.MODEL, Build.DEVICE, Build.MANUFACTURER) + fun isQuest2(): Boolean = quest2(Build.MODEL, Build.DEVICE, Build.MANUFACTURER) fun initialize(context: Context) { if (!isSupported()) return val prefs = context.getSharedPreferences("session", Context.MODE_PRIVATE) - if (!prefs.getBoolean("questDefaultsV1", false)) { + val defaultsKey = if (isQuest2()) "quest2DefaultsV1" else "questDefaultsV1" + if (!prefs.getBoolean(defaultsKey, false)) { // Auto would download an unwrapped display driver and lose the compatibility path. // Apply once so deliberate changes made during headset testing remain possible. prefs.edit() .putString("gpuDriverMode", SessionPrefs.GPU_DRIVERS_MANUAL) - .putString("androidDriver", DRIVER) + .putString("androidDriver", if (isQuest2()) DRIVER_A6XX else DRIVER) .putString("linuxDriver", "") // The existing HDR option uses SurfaceControl presentation. This is a // corruption workaround from upstream issue #245, not a claim of HDR accuracy. .putBoolean("hdr.steam", true) - .putBoolean("questDefaultsV1", true) + .putBoolean(defaultsKey, true) .apply() } val report = buildString { @@ -51,7 +58,7 @@ object QuestExperimental { appendLine("androidDriver=${SessionPrefs.androidDriver(context)}") appendLine("steamSurfaceControlWorkaround=${SessionPrefs.hdr(context, "steam")}") appendLine("GPUOBJ fallback installed in Android driver and ARM64 libblsession") - appendLine("Experimental Quest 3/3S compatibility; 2D panel application") + appendLine("Experimental Quest 2/3/3S compatibility; 2D panel application") } Log.i(TAG, report) runCatching { File(context.filesDir, "quest-startup.txt").writeText(report) } diff --git a/app/src/test/java/com/droiddeck/launcher/session/QuestExperimentalTest.kt b/app/src/test/java/com/droiddeck/launcher/session/QuestExperimentalTest.kt index 5677b1519b..3f19a2a2ff 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/QuestExperimentalTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/QuestExperimentalTest.kt @@ -23,15 +23,33 @@ class QuestExperimentalTest { ShadowBuild.setDevice("phone") } - @Test fun otherDevicesAndQuest2KeepTheirSettings() { - for (model in listOf("Phone", "Quest 2")) { + @Test fun otherDevicesKeepTheirSettings() { + for (model in listOf("Phone", "Quest", "Quest Pro")) { ShadowBuild.setModel(model) QuestExperimental.initialize(context) assertEquals(SessionPrefs.GPU_DRIVERS_AUTO, SessionPrefs.gpuDriverMode(context)) assertEquals("", SessionPrefs.androidDriver(context)) assertFalse(SessionPrefs.hdr(context, "steam")) } - assertFalse(QuestExperimental.supported("Quest 2", "hollywood", "Oculus")) + assertFalse(QuestExperimental.supported("Phone", "hollywood", "Other")) + } + + @Test fun quest2SelectsA6xxInsteadOfQuest3DriverAndPreservesLaterChoices() { + ShadowBuild.setModel("Quest 2") + // A prior Quest 3 flag must not suppress Quest 2's own migration. + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit() + .putBoolean("questDefaultsV1", true).commit() + QuestExperimental.initialize(context) + assertEquals(SessionPrefs.GPU_DRIVERS_MANUAL, SessionPrefs.gpuDriverMode(context)) + assertEquals(QuestExperimental.DRIVER_A6XX, SessionPrefs.androidDriver(context)) + assertEquals("", SessionPrefs.linuxDriver(context)) + assertTrue(SessionPrefs.hdr(context, "steam")) + assertTrue(QuestExperimental.supported("unknown", "hollywood", "Oculus")) + assertTrue(QuestExperimental.supported("unknown", "hollywood", "Meta")) + assertFalse(QuestExperimental.quest2("Quest 3", "eureka", "Meta")) + SessionPrefs.setAndroidDriver(context, "chosen-a6xx-driver") + QuestExperimental.initialize(context) + assertEquals("chosen-a6xx-driver", SessionPrefs.androidDriver(context)) } @Test fun questDefaultsSelectBothCompatibilityPathsAndAreAppliedOnlyOnce() { diff --git a/docs/quest.md b/docs/quest.md index af5871d0ee..307d5f84ba 100644 --- a/docs/quest.md +++ b/docs/quest.md @@ -1,7 +1,23 @@ -# Experimental Quest 3/3S support +# Experimental Quest 2/3/3S support Quest 3/3S runs DroidDeck as a 2D panel. This does not add immersive VR or -OpenXR support. Quest 2 is outside the bundled Adreno 7xx driver path. +OpenXR support. Quest 2 has a separate experimental Adreno 6xx driver path. + +Quest 2 selects `turnip26.3.0-quest2`, a pinned Banners-Turnip A6xx/A7xx build +with the same GPUOBJ adapter. It does not select the Quest 3 A7xx binary. +The first Quest 2 launch applies manual driver selection and the SurfaceControl +workaround, even if `questDefaultsV1` exists from an earlier install. Later user +choices are retained. The separate `turnip26.3.0-a6xx` bundle provides a plain +Adreno 6xx offline fallback for other devices; their driver Auto behavior remains. +Neither family-wide hardware coverage nor Quest 2 operation has been verified. + +The A6xx input URL and SHA-256 are pinned in `tools/quest/build-driver.py`. +Both A6xx bundles are prepared by the existing local/CI wrapper build step and +covered by runtime-input attestation. Quest 3/3S retains its original driver. +Early installation and compositor breadcrumbs are written to `driver-setup.txt` +in private files and, when available, the app's external files directory. They +do not require a Steam session. The existing Quest Java crash file now also +applies to Quest 2; native crashes still require Android logcat. Install the standard DroidDeck APK on Quest 3/3S. Device detection on the first launch selects manual drivers, the bundled diff --git a/tools/quest/build-driver.py b/tools/quest/build-driver.py index b421f9974a..f5376f20b7 100644 --- a/tools/quest/build-driver.py +++ b/tools/quest/build-driver.py @@ -7,9 +7,81 @@ import subprocess import sys import tarfile import tempfile +import hashlib +import urllib.request +import zipfile ROOT = Path(__file__).resolve().parents[2] OUTPUT = ROOT / 'app/build/prepared-assets/graphics_driver/adrenotools-turnip25.1.0-quest1.tzst' +A6XX_TAG = 'v26.3.0-20261012-r2' +A6XX_SHA256 = 'bb1b2c51e6446cf428d70255d037be169ac68108c00af33aa1ba7ece711f8336' +A6XX_URL = f'https://github.com/The412Banner/Banners-Turnip/releases/download/{A6XX_TAG}/Turnip-{A6XX_TAG}.zip' + + +def pack(entries, output): + stream = io.BytesIO() + with tarfile.open(fileobj=stream, mode='w', format=tarfile.USTAR_FORMAT) as archive: + for name, content in entries: + entry = tarfile.TarInfo(name) + entry.size = len(content) + entry.mode = 0o644 + archive.addfile(entry, io.BytesIO(content)) + compressed = subprocess.run(['zstd', '-q', '-19', '-c'], input=stream.getvalue(), + capture_output=True, check=True).stdout + output.parent.mkdir(parents=True, exist_ok=True) + output.write_bytes(compressed) + print(output) + + +def build_a6xx(ndk, output_dir=OUTPUT.parent, archive_path=None): + """Pin a real A6xx driver, with a separate Quest adapter around the same bytes.""" + cached = archive_path or ROOT / 'app/build/quest-inputs' / f'Turnip-{A6XX_TAG}.zip' + if not cached.exists(): + cached.parent.mkdir(parents=True, exist_ok=True) + data = urllib.request.urlopen(A6XX_URL, timeout=120).read() + if hashlib.sha256(data).hexdigest() != A6XX_SHA256: + raise ValueError('A6xx archive checksum mismatch') + cached.write_bytes(data) + data = cached.read_bytes() + if hashlib.sha256(data).hexdigest() != A6XX_SHA256: + raise ValueError('A6xx archive checksum mismatch') + with zipfile.ZipFile(io.BytesIO(data)) as archive: + driver = archive.read('libvulkan_freedreno.so') + original_meta = json.loads(archive.read('meta.json')) + if original_meta.get('libraryName') != 'libvulkan_freedreno.so': + raise ValueError('Unexpected A6xx driver library') + hosts = list((Path(ndk) / 'toolchains/llvm/prebuilt').glob('*')) + if len(hosts) != 1: + raise ValueError('Expected one NDK host toolchain') + llvm = hosts[0] / 'bin' + provenance = (f'Banners-Turnip {A6XX_TAG}\n{A6XX_URL}\nSHA256 {A6XX_SHA256}\n' + 'Mesa source: a0ff50acf0e1d152f54949490fa41558d2e0f7a4\n' + 'Quest adapter: DroidDeck tools/quest (GPL-3.0-or-later)\n').encode() + for quest in (False, True): + meta = dict(original_meta) + meta['name'] = 'Turnip Adreno 6xx' + (' - Quest 2 GPUOBJ experimental' if quest else ' - bundled fallback') + meta['description'] += ' Bundled for Adreno 6xx; Quest 2 hardware validation pending.' + entries = [('libvulkan_freedreno.so', driver), ('SOURCE.txt', provenance)] + if quest: + with tempfile.TemporaryDirectory(prefix='quest-a6xx-') as folder: + work = Path(folder) + original = work / 'libvulkan_freedreno.so' + original.write_bytes(driver) + wrapper = work / 'libquest_turnip.so' + subprocess.run([ + str(llvm / 'aarch64-linux-android28-clang'), '-shared', '-fPIC', '-O2', + '-Wall', '-Wextra', '-Werror', '-fvisibility=hidden', + '-Wl,-z,max-page-size=16384', '-Wl,-soname,libquest_turnip.so', + '-Wl,--no-as-needed', str(original), '-Wl,--as-needed', + str(ROOT / 'tools/quest/android_wrapper.c'), str(ROOT / 'tools/quest/kgsl_compat.c'), + '-ldl', '-llog', '-o', str(wrapper), + ], check=True) + subprocess.run([str(llvm / 'llvm-strip'), '--strip-unneeded', str(wrapper)], check=True) + entries.append(('libquest_turnip.so', wrapper.read_bytes())) + meta['libraryName'] = 'libquest_turnip.so' + entries.append(('meta.json', (json.dumps(meta, indent=2) + '\n').encode())) + name = 'turnip26.3.0-quest2' if quest else 'turnip26.3.0-a6xx' + pack(entries, output_dir / f'adrenotools-{name}.tzst') def build(ndk, output=OUTPUT): @@ -58,3 +130,4 @@ def build(ndk, output=OUTPUT): if __name__ == '__main__': build(sys.argv[1]) + build_a6xx(sys.argv[1]) diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index c9716edf81..eac1c27c87 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -53,11 +53,16 @@ def outputs(root): result['assets/pulseaudio.tzst'] = 'app/build/prepared-assets/pulseaudio.tzst' result['assets/graphics_driver/adrenotools-turnip25.1.0-quest1.tzst'] = \ 'app/build/prepared-assets/graphics_driver/adrenotools-turnip25.1.0-quest1.tzst' + for name in ['turnip26.3.0-a6xx', 'turnip26.3.0-quest2']: + result[f'assets/graphics_driver/adrenotools-{name}.tzst'] = \ + f'app/build/prepared-assets/graphics_driver/adrenotools-{name}.tzst' return result def required(): paths = ['assets/graphics_driver/adrenotools-turnip25.1.0-quest1.tzst'] + paths += [f'assets/graphics_driver/adrenotools-{name}.tzst' + for name in ['turnip26.3.0-a6xx', 'turnip26.3.0-quest2']] paths += ['assets/linuxfs/' + name for name in ['libfakeinput.so', 'libblsession.so', 'libblfastpath.so', 'libssbs.so', 'usr/local/bin/droiddeck-clipboard', 'usr/local/bin/gamescope', 'usr/local/lib/droiddeck/uruntime']]