Skip to content

more and more linux support #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Weever1337 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

more and more linux support #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions atumvr-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,16 @@ dependencies {
api("org.lwjgl:lwjgl-openxr")


// Windows natives
api("org.lwjgl:lwjgl::natives-windows")
api("org.lwjgl:lwjgl-opengl::natives-windows")
api("org.lwjgl:lwjgl-glfw::natives-windows")
api("org.lwjgl:lwjgl-openxr::natives-windows")

// Linux natives
api("org.lwjgl:lwjgl::natives-linux")
api("org.lwjgl:lwjgl-opengl::natives-linux")
api("org.lwjgl:lwjgl-glfw::natives-linux")
api("org.lwjgl:lwjgl-openxr::natives-linux")
}

Expand Down
63 changes: 40 additions & 23 deletions atumvr-core/src/main/java/me/phoenixra/atumvr/core/session/XRSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,30 +112,47 @@ public Struct<?> createGraphicsBinding(MemoryStack stack,
GLFWNativeWGL.glfwGetWGLContext(windowHandle)
);
} else if (Platform.get() == Platform.LINUX) {
long xDisplay = GLFWNativeX11.glfwGetX11Display();

long glXContext = GLFWNativeGLX.glfwGetGLXContext(windowHandle);
long glXWindowHandle = GLFWNativeGLX.glfwGetGLXWindow(windowHandle);

int fbXID = glXQueryDrawable(xDisplay, glXWindowHandle, GLX_FBCONFIG_ID);
PointerBuffer fbConfigBuf = glXChooseFBConfig(
xDisplay, X11.XDefaultScreen(xDisplay),
stackInts(GLX_FBCONFIG_ID, fbXID, 0)
);
if (fbConfigBuf == null) {
throw new AtumVRException("Framebuffer config is null");
try {
long xDisplay = GLFWNativeX11.glfwGetX11Display();

if (xDisplay == 0L) {
throw new AtumVRException(
"X11 display is null! Visor currently only supports X11/XWayland on Linux. " +
"If you are using Wayland, please force Minecraft to run through XWayland"
);
}

long glXContext = GLFWNativeGLX.glfwGetGLXContext(windowHandle);
long glXWindowHandle = GLFWNativeGLX.glfwGetGLXWindow(windowHandle);

int fbXID = glXQueryDrawable(xDisplay, glXWindowHandle, GLX_FBCONFIG_ID);
PointerBuffer fbConfigBuf = glXChooseFBConfig(
xDisplay, X11.XDefaultScreen(xDisplay),
stackInts(GLX_FBCONFIG_ID, fbXID, 0)
);

if (fbConfigBuf == null) {
throw new AtumVRException("Framebuffer config is null");
}

long fbConfig = fbConfigBuf.get();
return XrGraphicsBindingOpenGLXlibKHR.calloc(stack).set(
KHROpenGLEnable.XR_TYPE_GRAPHICS_BINDING_OPENGL_XLIB_KHR,
NULL,
xDisplay,
(int) Objects.requireNonNull(glXGetVisualFromFBConfig(xDisplay, fbConfig)).visualid(),
fbConfig,
glXWindowHandle,
glXContext
);
} catch (AtumVRException e) {
throw e;
} catch (Throwable t) {
throw new AtumVRException(
"Failed to initialize Linux graphics binding. Ensure you are running under X11/XWayland, not native Wayland",
t
);
}
long fbConfig = fbConfigBuf.get();

return XrGraphicsBindingOpenGLXlibKHR.calloc(stack).set(
KHROpenGLEnable.XR_TYPE_GRAPHICS_BINDING_OPENGL_XLIB_KHR,
NULL,
xDisplay,
(int) Objects.requireNonNull(glXGetVisualFromFBConfig(xDisplay, fbConfig)).visualid(),
fbConfig,
glXWindowHandle,
glXContext
);
} else {
throw new AtumVRException("MacOS not supported");
}
Expand Down