diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-12-05 00:31:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-05 00:31:12 +0100 |
| commit | 8912f3e4a7c012443e941f4c6f2342c9913fa330 (patch) | |
| tree | e54c2aeda06a53fc4e4bbe48e126f31a5b3dc919 /modules/openxr | |
| parent | 55da3c1631906d7daabcc8bb5b43a74235567f39 (diff) | |
| parent | 61cec0b023a87c61e4aeec3b79b723fd461bc8a4 (diff) | |
Merge pull request #69578 from dsnopek/android-native-handles
Clean up DisplayServerAndroid::window_get_native_handle() with the GLES3 renderer
Diffstat (limited to 'modules/openxr')
| -rw-r--r-- | modules/openxr/extensions/openxr_opengl_extension.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/openxr/extensions/openxr_opengl_extension.cpp b/modules/openxr/extensions/openxr_opengl_extension.cpp index 234c5f8391..3b7c130149 100644 --- a/modules/openxr/extensions/openxr_opengl_extension.cpp +++ b/modules/openxr/extensions/openxr_opengl_extension.cpp @@ -136,7 +136,7 @@ void *OpenXROpenGLExtension::set_session_create_and_get_next_pointer(void *p_nex graphics_binding_gl.type = XR_TYPE_GRAPHICS_BINDING_OPENGL_ES_ANDROID_KHR; graphics_binding_gl.next = p_next_pointer; - graphics_binding_gl.display = eglGetCurrentDisplay(); + graphics_binding_gl.display = (void *)display_server->window_get_native_handle(DisplayServer::DISPLAY_HANDLE); 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 = (void *)display_server->window_get_native_handle(DisplayServer::OPENGL_CONTEXT); #else |