summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2022-11-11 10:42:05 +0100
committerRémi Verschelde <rverschelde@gmail.com>2022-11-11 10:42:05 +0100
commitf646a2c7463d5f4e7dc7f667ae5705c08eb4e1d3 (patch)
treeef3a6087ca2596288383daa84fe0eb70eafffb31
parent6dc8e0a7dd83559a8a3bcaa307e65def8e0a4512 (diff)
parentc767cc16eab10be8fd60b42d5cf020d1054cb2ea (diff)
Merge pull request #68453 from dsnopek/openxr-opengl-rendundant-x11
[openxr] Remove unnecessary fallbacks for native handles on X11
-rw-r--r--modules/openxr/extensions/openxr_opengl_extension.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/modules/openxr/extensions/openxr_opengl_extension.cpp b/modules/openxr/extensions/openxr_opengl_extension.cpp
index a25727f885..ee69144123 100644
--- a/modules/openxr/extensions/openxr_opengl_extension.cpp
+++ b/modules/openxr/extensions/openxr_opengl_extension.cpp
@@ -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;