From 09e09d933560bd02fca1b666649f2f13ac0cce50 Mon Sep 17 00:00:00 2001
From: David Snopek <dsnopek@gmail.com>
Date: Mon, 4 Nov 2024 10:40:05 -0600
Subject: [PATCH] Patch the OpenXR headers to get EGL from GLAD if we're using
 it

---
 .github/workflows/linux_builds.yml            |  2 +-
 .../openxr/patches/use-egl-from-glad.diff     | 27 +++++++++++++++++++
 .../openxr/src/common/xr_dependencies.h       |  8 ++++++
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 thirdparty/openxr/patches/use-egl-from-glad.diff

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 348e2bb317b..dc3d9f37862 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -106,7 +106,7 @@ jobs:
       # TODO: Figure out somehow how to embed this one.
       - name: wayland-scanner dependency
         run: |
-          sudo apt-get install libwayland-bin libegl-dev
+          sudo apt-get install libwayland-bin
 
       - name: Free disk space on runner
         run: |
diff --git a/thirdparty/openxr/patches/use-egl-from-glad.diff b/thirdparty/openxr/patches/use-egl-from-glad.diff
new file mode 100644
index 00000000000..29c746d5c7a
--- /dev/null
+++ b/thirdparty/openxr/patches/use-egl-from-glad.diff
@@ -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)
diff --git a/thirdparty/openxr/src/common/xr_dependencies.h b/thirdparty/openxr/src/common/xr_dependencies.h
index 55d93bfbac6..a192a2ec6df 100644
--- a/thirdparty/openxr/src/common/xr_dependencies.h
+++ b/thirdparty/openxr/src/common/xr_dependencies.h
@@ -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)