godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Patch the OpenXR headers to get EGL from GLAD if we're using it

Browse Source
This commit is contained in:
David Snopek
2024-11-04 10:40:05 -06:00
parent 1bffd6c73b
commit 09e09d9335
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/linux_builds.yml vendored
View File

@@ -106,7 +106,7 @@ jobs:
# TODO: Figure out somehow how to embed this one. # TODO: Figure out somehow how to embed this one.
- name: wayland-scanner dependency - name: wayland-scanner dependency
run: | run: |
sudo apt-get install libwayland-bin libegl-dev sudo apt-get install libwayland-bin
- name: Free disk space on runner - name: Free disk space on runner
run: | run: |

27
thirdparty/openxr/patches/use-egl-from-glad.diff vendored Normal file
View File

@@ -0,0 +1,27 @@
diff -Nur openxr-orig/src/common/xr_dependencies.h openxr/src/common/xr_dependencies.h
--- openxr-orig/src/common/xr_dependencies.h 2024-11-04 10:38:11.940682727 -0600
+++ openxr/src/common/xr_dependencies.h 2024-11-04 10:38:46.351415476 -0600
@@ -65,7 +65,11 @@
#endif // XR_USE_GRAPHICS_API_OPENGL
#ifdef XR_USE_GRAPHICS_API_OPENGL_ES
+#ifdef GLAD_ENABLED
+#include "thirdparty/glad/glad/egl.h"
+#else
#include <EGL/egl.h>
+#endif
#endif // XR_USE_GRAPHICS_API_OPENGL_ES
#ifdef XR_USE_GRAPHICS_API_VULKAN
@@ -77,7 +81,11 @@
#endif // XR_USE_PLATFORM_WAYLAND
#ifdef XR_USE_PLATFORM_EGL
+#ifdef GLAD_ENABLED
+#include "thirdparty/glad/glad/egl.h"
+#else
#include <EGL/egl.h>
+#endif
#endif // XR_USE_PLATFORM_EGL
#if defined(XR_USE_PLATFORM_XLIB) || defined(XR_USE_PLATFORM_XCB)

8
thirdparty/openxr/src/common/xr_dependencies.h vendored
View File

@@ -65,7 +65,11 @@
#endif // XR_USE_GRAPHICS_API_OPENGL #endif // XR_USE_GRAPHICS_API_OPENGL
#ifdef XR_USE_GRAPHICS_API_OPENGL_ES #ifdef XR_USE_GRAPHICS_API_OPENGL_ES
#ifdef GLAD_ENABLED
#include "thirdparty/glad/glad/egl.h"
#else
#include <EGL/egl.h> #include <EGL/egl.h>
#endif
#endif // XR_USE_GRAPHICS_API_OPENGL_ES #endif // XR_USE_GRAPHICS_API_OPENGL_ES
#ifdef XR_USE_GRAPHICS_API_VULKAN #ifdef XR_USE_GRAPHICS_API_VULKAN
@@ -77,7 +81,11 @@
#endif // XR_USE_PLATFORM_WAYLAND #endif // XR_USE_PLATFORM_WAYLAND
#ifdef XR_USE_PLATFORM_EGL #ifdef XR_USE_PLATFORM_EGL
#ifdef GLAD_ENABLED
#include "thirdparty/glad/glad/egl.h"
#else
#include <EGL/egl.h> #include <EGL/egl.h>
#endif
#endif // XR_USE_PLATFORM_EGL #endif // XR_USE_PLATFORM_EGL
#if defined(XR_USE_PLATFORM_XLIB) || defined(XR_USE_PLATFORM_XCB) #if defined(XR_USE_PLATFORM_XLIB) || defined(XR_USE_PLATFORM_XCB)