diff options
| author | Thaddeus Crews <repiteo@outlook.com> | 2024-10-29 19:25:41 -0500 |
|---|---|---|
| committer | Thaddeus Crews <repiteo@outlook.com> | 2024-10-29 19:25:41 -0500 |
| commit | 23f03a7cce23563ae7d9c86684f20727b3939ea6 (patch) | |
| tree | 20ff1e09e869a78249b22e58f9d3674b9bc7795a | |
| parent | f8f9763c4abe1ca033f0b6f18a512ac895564f47 (diff) | |
| parent | 1803fe0cd5101a2dd536385decc7b67be589d743 (diff) | |
| download | redot-engine-23f03a7cce23563ae7d9c86684f20727b3939ea6.tar.gz | |
Merge pull request #98589 from juanjp600/openxr-no-wayland-build-fix
Fix OpenXR module failing to build on Linux when Wayland is disabled
| -rw-r--r-- | modules/openxr/extensions/platform/openxr_opengl_extension.cpp | 4 | ||||
| -rw-r--r-- | modules/openxr/extensions/platform/openxr_opengl_extension.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/openxr/extensions/platform/openxr_opengl_extension.cpp b/modules/openxr/extensions/platform/openxr_opengl_extension.cpp index 07e26298bf..f75da49d87 100644 --- a/modules/openxr/extensions/platform/openxr_opengl_extension.cpp +++ b/modules/openxr/extensions/platform/openxr_opengl_extension.cpp @@ -64,7 +64,7 @@ HashMap<String, bool *> OpenXROpenGLExtension::get_requested_extensions() { #else request_extensions[XR_KHR_OPENGL_ENABLE_EXTENSION_NAME] = nullptr; #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; #endif @@ -135,7 +135,7 @@ XrGraphicsBindingOpenGLESAndroidKHR OpenXROpenGLExtension::graphics_binding_gl; #ifdef X11_ENABLED XrGraphicsBindingOpenGLXlibKHR OpenXROpenGLExtension::graphics_binding_gl; #endif -#ifdef EGL_ENABLED +#if defined(EGL_ENABLED) && defined(WAYLAND_ENABLED) XrGraphicsBindingEGLMNDX OpenXROpenGLExtension::graphics_binding_egl; #endif #endif diff --git a/modules/openxr/extensions/platform/openxr_opengl_extension.h b/modules/openxr/extensions/platform/openxr_opengl_extension.h index beb68e47e3..f4a73c667b 100644 --- a/modules/openxr/extensions/platform/openxr_opengl_extension.h +++ b/modules/openxr/extensions/platform/openxr_opengl_extension.h @@ -68,7 +68,7 @@ private: #ifdef X11_ENABLED static XrGraphicsBindingOpenGLXlibKHR graphics_binding_gl; #endif -#ifdef EGL_ENABLED +#if defined(EGL_ENABLED) && defined(WAYLAND_ENABLED) static XrGraphicsBindingEGLMNDX graphics_binding_egl; bool egl_extension_enabled = false; |