diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-11-29 23:45:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-29 23:45:38 +0100 |
| commit | d75a6b5a6d74de268d61efe178dfcfc13c38450d (patch) | |
| tree | c95866d528e2671e48a62eaa7c60ec682f4cbde0 /modules/openxr | |
| parent | cdd99e9bec16db60efd894a06826f6fea139d00d (diff) | |
| parent | 9141984e7ebc0bdbdd474cc6ced63e388f95a686 (diff) | |
Merge pull request #69355 from clayjohn/android-GLES3
Enable GLES3 on Android
Diffstat (limited to 'modules/openxr')
| -rw-r--r-- | modules/openxr/extensions/openxr_opengl_extension.cpp | 2 | ||||
| -rw-r--r-- | modules/openxr/openxr_api.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/openxr/extensions/openxr_opengl_extension.cpp b/modules/openxr/extensions/openxr_opengl_extension.cpp index 569030cc11..234c5f8391 100644 --- a/modules/openxr/extensions/openxr_opengl_extension.cpp +++ b/modules/openxr/extensions/openxr_opengl_extension.cpp @@ -138,7 +138,7 @@ void *OpenXROpenGLExtension::set_session_create_and_get_next_pointer(void *p_nex graphics_binding_gl.display = eglGetCurrentDisplay(); graphics_binding_gl.config = (EGLConfig)0; // https://github.com/KhronosGroup/OpenXR-SDK-Source/blob/master/src/tests/hello_xr/graphicsplugin_opengles.cpp#L122 - graphics_binding_gl.context = eglGetCurrentContext(); + graphics_binding_gl.context = (void *)display_server->window_get_native_handle(DisplayServer::OPENGL_CONTEXT); #else graphics_binding_gl.type = XR_TYPE_GRAPHICS_BINDING_OPENGL_XLIB_KHR; graphics_binding_gl.next = p_next_pointer; diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp index d6580ebfa6..59d3865acd 100644 --- a/modules/openxr/openxr_api.cpp +++ b/modules/openxr/openxr_api.cpp @@ -51,7 +51,7 @@ #define XR_USE_GRAPHICS_API_VULKAN #endif #ifdef GLES3_ENABLED -#ifdef ANDROID +#ifdef ANDROID_ENABLED #define XR_USE_GRAPHICS_API_OPENGL_ES #include <EGL/egl.h> #include <EGL/eglext.h> @@ -59,7 +59,7 @@ #include <GLES3/gl3ext.h> #else #define XR_USE_GRAPHICS_API_OPENGL -#endif // ANDROID +#endif // ANDROID_ENABLED #ifdef X11_ENABLED #include OPENGL_INCLUDE_H #define GL_GLEXT_PROTOTYPES 1 |