Skip to content

[release-2026.10] Prefer GLFW X11 backend when no Wayland display is set (NVBug 6759666) - #13

Merged
lgulich merged 1 commit into
release-2026.10from
lgulich/glfw-x11-hint-release-2026.10
Oct 7, 2026
Merged

lgulich merged 1 commit into
release-2026.10from
lgulich/glfw-x11-hint-release-2026.10

Conversation

@lgulich

@lgulich lgulich commented Oct 7, 2026

Copy link
Copy Markdown
Collaborator

Summary

Backport of #11 for Isaac ROS release-2026.10, which pins b02edd3. This branch is b02edd3 + the GLFW fix only (no impedance work, no upstream sync). Cherry-pick applied cleanly.

 MujocoSimulation::initialize
+  prefer_x11_without_wayland_display()   # viewer glfwInit()
 CameraPlugin::init
+  prefer_x11_without_wayland_display()   # camera glfwInit()

See #11 for root cause (GLFW 3.4 probes Wayland first when XDG_SESSION_TYPE is unset; libwayland prints XDG_RUNTIME_DIR is invalid or not set inside Docker).

Evidence

b02edd3 + this change, Bazel build of unitree_g1_controller_manager.launch.py hardware_type:=mujoco initial_controller_group:=agile_velocity with XDG_RUNTIME_DIR/XDG_SESSION_TYPE/WAYLAND_DISPLAY unset:

  • Before: XDG_RUNTIME_DIR is invalid → 2
    After: → 0; viewer, camera rendering loop and controller switch all start.
  • Same 2 → 0 in an isaac-ros activate container with debs built from b02edd3 + this change.

Merge Danger

Door: two-way

Blast Radius: small

Only GLFW platform selection when WAYLAND_DISPLAY is unset.

🤖 Generated with Claude Code

GLFW >= 3.4 built with both Wayland and X11 probes Wayland first when XDG_SESSION_TYPE is unset, so inside Docker libwayland prints "error: XDG_RUNTIME_DIR is invalid or not set in the environment." before GLFW falls back to X11. Hint the X11 platform before every glfwInit() (viewer and camera plugin, which can each carry their own statically linked GLFW) when WAYLAND_DISPLAY is unset.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 0c75738)
@lgulich
lgulich merged commit 90e8413 into release-2026.10 Oct 7, 2026
3 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant