From e49fdd85236ec66f4c12f4d095c2571ae26ce2e9 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Tue, 3 Dec 2019 11:54:05 -0600 Subject: [PATCH] st/oxr: EGL extension requires OpenGL enabled --- scripts/generate_oxr_ext_support.py | 2 +- src/xrt/state_trackers/oxr/oxr_extension_support.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/generate_oxr_ext_support.py b/scripts/generate_oxr_ext_support.py index cf513ed41..5fe875f77 100755 --- a/scripts/generate_oxr_ext_support.py +++ b/scripts/generate_oxr_ext_support.py @@ -15,7 +15,7 @@ EXTENSIONS = ( ['XR_KHR_opengl_enable', 'XR_USE_GRAPHICS_API_OPENGL'], ['XR_KHR_opengl_es_enable', 'XR_USE_GRAPHICS_API_OPENGL_ES'], ['XR_KHR_vulkan_enable', 'XR_USE_GRAPHICS_API_VULKAN'], - ['XR_MND_egl_enable', 'XR_USE_PLATFORM_EGL'], + ['XR_MND_egl_enable', 'XR_USE_PLATFORM_EGL', 'XR_USE_GRAPHICS_API_OPENGL'], ['XR_MND_headless'], ) diff --git a/src/xrt/state_trackers/oxr/oxr_extension_support.h b/src/xrt/state_trackers/oxr/oxr_extension_support.h index da596f450..f4bd89d05 100644 --- a/src/xrt/state_trackers/oxr/oxr_extension_support.h +++ b/src/xrt/state_trackers/oxr/oxr_extension_support.h @@ -81,7 +81,8 @@ /* * XR_MND_egl_enable */ -#if defined(XR_MND_egl_enable) && defined(XR_USE_PLATFORM_EGL) +#if defined(XR_MND_egl_enable) && defined(XR_USE_PLATFORM_EGL) && \ + defined(XR_USE_GRAPHICS_API_OPENGL) #define OXR_HAVE_MND_egl_enable #define OXR_EXTENSION_SUPPORT_MND_egl_enable(_) \ _(MND_egl_enable, MND_EGL_ENABLE)