Fix 3D on the glasses: full-res SteamVR presenter, revert VR 3D at session end, coalesce vsync ticks, no session restart after end

This commit is contained in:
maxjivi05 committed 2026-10-13 22:15:47 -04:00
1 parent 697565f84b
commit fb207b561f
5 files changed
+67 -13

No files matched your search

@@ -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;
}
@@ -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)
}
}
@@ -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
@@ -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()