Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #68453 from dsnopek/openxr-opengl-rendundant-x11

Browse source 
[openxr] Remove unnecessary fallbacks for native handles on X11
This commit is contained in:
Rémi Verschelde 2022-11-11 10:42:05 +01:00
commit f646a2c746
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/openxr/extensions/openxr_opengl_extension.cpp
View file

@ -151,19 +151,6 @@ void *OpenXROpenGLExtension::set_session_create_and_get_next_pointer(void *p_nex
graphics_binding_gl.glxContext = (GLXContext)glxcontext_handle;
graphics_binding_gl.glxDrawable = (GLXDrawable)glxdrawable_handle;
if (graphics_binding_gl.xDisplay == nullptr) {
print_line("OpenXR Failed to get xDisplay from Godot, using XOpenDisplay(nullptr)");
graphics_binding_gl.xDisplay = XOpenDisplay(nullptr);
}
if (graphics_binding_gl.glxContext == nullptr) {
print_line("OpenXR Failed to get glxContext from Godot, using glXGetCurrentContext()");
graphics_binding_gl.glxContext = glXGetCurrentContext();
}
if (graphics_binding_gl.glxDrawable == 0) {
print_line("OpenXR Failed to get glxDrawable from Godot, using glXGetCurrentDrawable()");
graphics_binding_gl.glxDrawable = glXGetCurrentDrawable();
}
// spec says to use proper values but runtimes don't care
graphics_binding_gl.visualid = 0;
graphics_binding_gl.glxFBConfig = 0;