From fb207b561fd25d70d9dd9e03d2c28721937985e5 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Tue, 13 Oct 2026 22:15:47 -0400 Subject: [PATCH] Fix 3D on the glasses: full-res SteamVR presenter, revert VR 3D at session end, coalesce vsync ticks, no session restart after end --- app/src/main/cpp/waylandcomp/src/compositor.c | 5 +- .../com/droiddeck/launcher/SessionActivity.kt | 12 +++-- .../com/droiddeck/launcher/glasses/Glasses.kt | 14 ++++++ .../launcher/session/SessionService.kt | 1 + tools/vr/src/presenter.cpp | 48 ++++++++++++++++--- 5 files changed, 67 insertions(+), 13 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 36516a12d..a1550af9a 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -3290,19 +3290,22 @@ static void output_resized(void) { /* wl event-loop callback: drain queued input events written by the Android UI thread. */ static int on_input_readable(int fd, uint32_t mask, void *data) { struct input_msg m; + int vsync = 0; + int64_t vsync_ns = 0; while (read(fd, &m, sizeof(m)) == (ssize_t)sizeof(m)) { switch (m.type) { case 1: deliver_key(&m); break; case 2: pointer_event(m.p1, m.p2, 0, 0); break; /* scene motion */ case 3: pointer_button(m.p1, m.p2); break; /* button at pointer */ case 4: scroll_event(m.p1); break; - case 5: on_vsync(((int64_t)m.p1 << 32) | (uint32_t)m.p2); break; + case 5: vsync = 1; vsync_ns = ((int64_t)m.p1 << 32) | (uint32_t)m.p2; break; case 6: pointer_delta(m.p1 / 256.0, m.p2 / 256.0); break; /* relative motion, 1/256 px */ case 7: deliver_touch(&m); break; case 8: output_resized(); break; default: deliver_pointer(&m); break; } } + if (vsync) on_vsync(vsync_ns); return 0; } diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index dfa378575..e4c675cc3 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -319,6 +319,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var glassesScreen: GlassesScreen? = null private var glassesOutputActive by mutableStateOf(false) private var glasses3dForVr = false + private var ended = false private var glassesPresent = false private var steamVrAutoTried = false private var steamVrInstallTried = false @@ -1373,7 +1374,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun surfaceCreated(holder: SurfaceHolder) { if (holder !== outputHolder()) return - if (installingRuntime || SessionState.stopRequested) return + if (installingRuntime || SessionState.stopRequested || ended) return if (!SessionState.running) { SessionEvents.transition(SessionPhase.STARTING_COMPOSITOR, "compositor.starting") } @@ -1654,6 +1655,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun onSessionEnded(status: Int) { + ended = true if (isInPictureInPictureMode) { runOnUiThread { finish() } return @@ -2653,7 +2655,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (glassesOutputActive) { if (action == "start" && glassesSettings.auto3d && glasses.can3d && !glasses.sbs) { glasses3dForVr = true - Glasses.set3d(true) + Glasses.set3dForVr(true) } if (action == "install") steamVrStatus = SteamVr.Status.INSTALLING steamVrWorker.execute { @@ -2843,7 +2845,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun updateGlassesScreen() { if (!::surfaceView.isInitialized) return val g = glasses - val want = started && !isInPictureInPictureMode && !runtimeRemovalBlocked && g.usable && glassesSettings.gameOnGlasses + val want = started && !ended && !isInPictureInPictureMode && !runtimeRemovalBlocked && g.usable && glassesSettings.gameOnGlasses val target = if (want) Glasses.glassesDisplay()?.takeIf { it.isValid } else null val current = glassesScreen if (current != null && current.display.displayId == target?.displayId) { @@ -2882,11 +2884,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (now == SteamVr.Status.RUNNING) { if (glassesSettings.auto3d && g.can3d && !g.sbs && !glasses3dForVr) { glasses3dForVr = true - Glasses.set3d(true) + Glasses.set3dForVr(true) } } else if (glasses3dForVr && now != SteamVr.Status.UNAVAILABLE) { glasses3dForVr = false - if (g.sbs) Glasses.set3d(false) + Glasses.set3dForVr(false) } } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt b/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt index f36952e61..5c2f054cf 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt @@ -116,6 +116,7 @@ object Glasses { private var sbsAskedAt = 0L private var glassesMode = 0 private var autoModeSent = false + private var vr3d = false @Volatile private var sink: PoseSink? = null @Volatile private var probe: ((ByteArray) -> Unit)? = null @@ -174,10 +175,23 @@ object Glasses { } fun set3d(on: Boolean) = post { + vr3d = false val s = _state.value if (if (on) s.can3d else s.canControl) sendMode(on) } + fun set3dForVr(on: Boolean) = post { + val s = _state.value + if (on) { + if (!s.can3d || s.sbs) return@post + vr3d = true + sendMode(true) + } else if (vr3d) { + vr3d = false + if (s.sbs && s.canControl) sendMode(false) + } + } + fun setBrightness(level: Int) = post { val s = _state.value if (!s.canControl) return@post diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 01f9112eb..e35be45a9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -1503,6 +1503,7 @@ class SessionService : Service() { val failureStatus = SessionState.failureStatus ?: status SessionEvents.fail(code, message, failureStatus) } + com.droiddeck.launcher.glasses.Glasses.set3dForVr(false) SessionState.notifyEnded(status) stopForeground(STOP_FOREGROUND_REMOVE) stopSelf() diff --git a/tools/vr/src/presenter.cpp b/tools/vr/src/presenter.cpp index 013f85899..e34d0db7e 100644 --- a/tools/vr/src/presenter.cpp +++ b/tools/vr/src/presenter.cpp @@ -9,6 +9,7 @@ typedef unsigned long VisualID; #include #include "xdg-shell-client-protocol.h" +#include "../../../app/src/main/cpp/waylandcomp/src/headpose_shm.h" #include "presenter.h" #include "present_sync.h" @@ -231,6 +232,7 @@ private: } else if (f.texture[0]) { std::this_thread::sleep_until(at + guard_); } + if (f.texture[0] && wayland_) FollowPanel(); if (f.texture[0] && Draw(f)) shown++; auto now = std::chrono::steady_clock::now(); if (now - lastLog > std::chrono::seconds(10)) { @@ -245,6 +247,42 @@ private: if (dev_) vk_.DeviceWaitIdle(dev_); } + bool PanelSize(uint32_t *w, uint32_t *h) { + if (!pose_) { + int fd = open("/run/droiddeck/" DROIDDECK_HEADPOSE_FILE, O_RDONLY | O_CLOEXEC); + if (fd < 0) return false; + void *m = mmap(nullptr, sizeof(droiddeck_headpose), PROT_READ, MAP_SHARED, fd, 0); + close(fd); + if (m == MAP_FAILED) return false; + pose_ = (const volatile droiddeck_headpose *)m; + } + for (int tries = 0; tries < 8; tries++) { + const uint32_t a = __atomic_load_n(&pose_->seq, __ATOMIC_ACQUIRE); + if (a & 1u) continue; + const uint32_t ew = pose_->eye_w, eh = pose_->eye_h; + __atomic_thread_fence(__ATOMIC_ACQUIRE); + if (__atomic_load_n(&pose_->seq, __ATOMIC_RELAXED) != a) continue; + if (!ew || !eh || pose_->magic != DROIDDECK_HEADPOSE_MAGIC) return false; + *w = ew * 2; + *h = eh; + return true; + } + return false; + } + + void FollowPanel() { + uint32_t w = 0, h = 0; + if (!PanelSize(&w, &h) || (w == width_ && h == height_)) return; + vk_.DeviceWaitIdle(dev_); + vk_.DestroySwapchainKHR(dev_, swapchain_, nullptr); + swapchain_ = VK_NULL_HANDLE; + images_.clear(); + Log("presenter: panel now %ux%u (was %ux%u)", w, h, width_, height_); + width_ = w; + height_ = h; + CreateSwapchain(); + } + std::chrono::microseconds guard_{4000}; static constexpr std::chrono::milliseconds kDrawnTimeout{100}; @@ -339,12 +377,7 @@ private: // scales the picture down on the way. The compositor's configure carries the session's output // size, which is often smaller; it is the fallback. width_ = height_ = 0; - int fd = open("/run/droiddeck/droiddeck-headpose", O_RDONLY | O_CLOEXEC); - if (fd >= 0) { - uint32_t eye[2] = {0, 0}; - if (pread(fd, eye, sizeof(eye), 72) == (ssize_t)sizeof(eye) && eye[0] && eye[1]) { width_ = eye[0] * 2; height_ = eye[1]; } - close(fd); - } + if (!PanelSize(&width_, &height_)) width_ = height_ = 0; if (!width_ && cfgW_ > 0 && cfgH_ > 0) { width_ = (uint32_t)cfgW_; height_ = (uint32_t)cfgH_; } if (!width_) { width_ = 1920; height_ = 1080; } Log("presenter: %ux%u fullscreen window on Wayland display %s (configured %s)", width_, height_, name, configured_ ? "yes" : "no"); @@ -564,7 +597,7 @@ private: bool Draw(const EyeFrame &f) { const Imported *eye[2] = {Find(f.texture[0]), Find(f.texture[1])}; - if (!eye[0] || !eye[1]) return false; + if (!eye[0] || !eye[1] || !swapchain_) return false; vk_.WaitForFences(dev_, 1, &fence_, VK_TRUE, UINT64_MAX); uint32_t idx = 0; VkResult r = vk_.AcquireNextImageKHR(dev_, swapchain_, 100000000ull, acquired_, VK_NULL_HANDLE, &idx); @@ -640,6 +673,7 @@ private: uint32_t frameMark_ = 0, lastIssued_ = 0; bool frameTracked_ = false; const droiddeck_present_sync *sync_ = nullptr; + const volatile droiddeck_headpose *pose_ = nullptr; std::chrono::steady_clock::time_point syncTried_{}; bool haveFrame_ = false, exit_ = false, started_ = false; std::atomic submitted_{0};