godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Fix OpenXR module failing to build on Linux when Wayland is disabled

Browse Source
This commit is contained in:
Juan Pablo Arce
2024-10-27 14:03:03 -03:00
parent 61accf0605
commit 1803fe0cd5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openxr/extensions/platform/openxr_opengl_extension.cpp
View File

@@ -64,7 +64,7 @@ HashMap<String, bool *> OpenXROpenGLExtension::get_requested_extensions() {
#else #else
request_extensions[XR_KHR_OPENGL_ENABLE_EXTENSION_NAME] = nullptr; request_extensions[XR_KHR_OPENGL_ENABLE_EXTENSION_NAME] = nullptr;
#endif #endif
#if defined(LINUXBSD_ENABLED) && defined(EGL_ENABLED) #if defined(LINUXBSD_ENABLED) && defined(EGL_ENABLED) && defined(WAYLAND_ENABLED)
request_extensions[XR_MNDX_EGL_ENABLE_EXTENSION_NAME] = &egl_extension_enabled; request_extensions[XR_MNDX_EGL_ENABLE_EXTENSION_NAME] = &egl_extension_enabled;
#endif #endif
@@ -135,7 +135,7 @@ XrGraphicsBindingOpenGLESAndroidKHR OpenXROpenGLExtension::graphics_binding_gl;
#ifdef X11_ENABLED #ifdef X11_ENABLED
XrGraphicsBindingOpenGLXlibKHR OpenXROpenGLExtension::graphics_binding_gl; XrGraphicsBindingOpenGLXlibKHR OpenXROpenGLExtension::graphics_binding_gl;
#endif #endif
#ifdef EGL_ENABLED #if defined(EGL_ENABLED) && defined(WAYLAND_ENABLED)
XrGraphicsBindingEGLMNDX OpenXROpenGLExtension::graphics_binding_egl; XrGraphicsBindingEGLMNDX OpenXROpenGLExtension::graphics_binding_egl;
#endif #endif
#endif #endif

2
modules/openxr/extensions/platform/openxr_opengl_extension.h
View File

@@ -68,7 +68,7 @@ private:
#ifdef X11_ENABLED #ifdef X11_ENABLED
static XrGraphicsBindingOpenGLXlibKHR graphics_binding_gl; static XrGraphicsBindingOpenGLXlibKHR graphics_binding_gl;
#endif #endif
#ifdef EGL_ENABLED #if defined(EGL_ENABLED) && defined(WAYLAND_ENABLED)
static XrGraphicsBindingEGLMNDX graphics_binding_egl; static XrGraphicsBindingEGLMNDX graphics_binding_egl;
bool egl_extension_enabled = false; bool egl_extension_enabled = false;