From fc1ef0b639e69fd9e8dfddd2bf1239d668304ae3 Mon Sep 17 00:00:00 2001 From: David Snopek Date: Tue, 11 Mar 2025 10:32:22 -0500 Subject: [PATCH] OpenXR: Fix OpenGL version warning when using GLES (cherry picked from commit 63533862416cc21e5193b5dab162680cd7875f90) --- .../openxr/extensions/platform/openxr_opengl_extension.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/openxr/extensions/platform/openxr_opengl_extension.cpp b/modules/openxr/extensions/platform/openxr_opengl_extension.cpp index c4a05220115..08b3afb0192 100644 --- a/modules/openxr/extensions/platform/openxr_opengl_extension.cpp +++ b/modules/openxr/extensions/platform/openxr_opengl_extension.cpp @@ -141,7 +141,12 @@ XrGraphicsBindingEGLMNDX OpenXROpenGLExtension::graphics_binding_egl; #endif void *OpenXROpenGLExtension::set_session_create_and_get_next_pointer(void *p_next_pointer) { - XrVersion desired_version = XR_MAKE_VERSION(3, 3, 0); + GLint gl_version_major = 0; + GLint gl_version_minor = 0; + glGetIntegerv(GL_MAJOR_VERSION, &gl_version_major); + glGetIntegerv(GL_MINOR_VERSION, &gl_version_minor); + + XrVersion desired_version = XR_MAKE_VERSION(gl_version_major, gl_version_minor, 0); if (!check_graphics_api_support(desired_version)) { print_line("OpenXR: Trying to initialize with OpenGL anyway...");