The question says X11 and Wayland. My app works fine on X11. I do need it to work on Wayland so other people actually use it. Also, switching from X Window Handles to OpenGL or Vulkan will benefit it on X11 as well.