diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-09-25 17:18:00 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-09-25 17:18:00 +0200 |
commit | 9fdf24fa6766b30cbc7ce4deb70119b3c1025246 (patch) | |
tree | 7606be3c4f89a85bcb29ab02f7859f327cb98203 /modules/openxr/extensions/openxr_opengl_extension.h | |
parent | 91420573c07e983967fcd59c1229b1fbdd07d675 (diff) | |
parent | d7d334158a0bc86ff5b04ffd4085f092bbe50840 (diff) | |
download | redot-engine-9fdf24fa6766b30cbc7ce4deb70119b3c1025246.tar.gz |
Merge pull request #80881 from BastiaanOlij/openxr_foveation_ext
Implement OpenXR Foveated rendering support
Diffstat (limited to 'modules/openxr/extensions/openxr_opengl_extension.h')
-rw-r--r-- | modules/openxr/extensions/openxr_opengl_extension.h | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/modules/openxr/extensions/openxr_opengl_extension.h b/modules/openxr/extensions/openxr_opengl_extension.h index 1537f13067..3b0aa0bce9 100644 --- a/modules/openxr/extensions/openxr_opengl_extension.h +++ b/modules/openxr/extensions/openxr_opengl_extension.h @@ -39,38 +39,8 @@ #include "core/templates/vector.h" -#ifdef ANDROID_ENABLED -#define XR_USE_GRAPHICS_API_OPENGL_ES -#include <EGL/egl.h> -#include <EGL/eglext.h> -#include <GLES3/gl3.h> -#include <GLES3/gl3ext.h> -#else -#define XR_USE_GRAPHICS_API_OPENGL -#endif - -#ifdef WINDOWS_ENABLED -// Including windows.h here is absolutely evil, we shouldn't be doing this outside of platform -// however due to the way the openxr headers are put together, we have no choice. -#include <windows.h> -#endif - -#ifdef X11_ENABLED -#define GL_GLEXT_PROTOTYPES 1 -#define GL3_PROTOTYPES 1 -#include "thirdparty/glad/glad/gl.h" -#include "thirdparty/glad/glad/glx.h" - -#include <X11/Xlib.h> -#endif - -#ifdef ANDROID_ENABLED -// The jobject type from jni.h is used by openxr_platform.h on Android. -#include <jni.h> -#endif - -// Include platform dependent structs. -#include <openxr/openxr_platform.h> +// always include this as late as possible +#include "../openxr_platform_inc.h" class OpenXROpenGLExtension : public OpenXRGraphicsExtensionWrapper { public: |