From a55bfe4c21858eef0eb1bddf4085fcfde1b7e07d Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Thu, 23 Jan 2025 10:22:44 -0500 Subject: Hook up EGL where we can, build update Signed-off-by: Andrew Opalach --- .../packagefiles/glfm/get_egl_internal.diff | 39 ++++++++++++++++++++++ .../packagefiles/vulkan-headers/meson.build | 3 ++ subprojects/packagefiles/vulkan/meson.build | 3 -- 3 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 subprojects/packagefiles/glfm/get_egl_internal.diff create mode 100644 subprojects/packagefiles/vulkan-headers/meson.build delete mode 100644 subprojects/packagefiles/vulkan/meson.build (limited to 'subprojects/packagefiles') diff --git a/subprojects/packagefiles/glfm/get_egl_internal.diff b/subprojects/packagefiles/glfm/get_egl_internal.diff new file mode 100644 index 0000000..3c9098c --- /dev/null +++ b/subprojects/packagefiles/glfm/get_egl_internal.diff @@ -0,0 +1,39 @@ +diff --git a/include/glfm.h b/include/glfm.h +index ceace39..d18711c 100644 +--- a/include/glfm.h ++++ b/include/glfm.h +@@ -892,6 +892,9 @@ ANativeActivity *glfmAndroidGetActivity(void) GLFM_DEPRECATED("Use glfmGetAndroi + /// ``GLFMAppFocusFunc``. + void *glfmGetAndroidActivity(const GLFMDisplay *display); + ++void *glfmGetEglDisplay(const GLFMDisplay *display); ++void *glfmGetEglContext(const GLFMDisplay *display); ++ + #endif // GLFM_EXPOSE_NATIVE_ANDROID + + #ifdef __cplusplus +diff --git a/src/glfm_android.c b/src/glfm_android.c +index 67d1927..7942ddf 100644 +--- a/src/glfm_android.c ++++ b/src/glfm_android.c +@@ -2800,4 +2800,20 @@ void *glfmGetAndroidActivity(const GLFMDisplay *display) { + return platformData->activity; + } + ++void *glfmGetEglDisplay(const GLFMDisplay *display) { ++ if (!display || !display->platformData) { ++ return NULL; ++ } ++ GLFMPlatformData *platformData = display->platformData; ++ return platformData->eglDisplay; ++} ++ ++void *glfmGetEglContext(const GLFMDisplay *display) { ++ if (!display || !display->platformData) { ++ return NULL; ++ } ++ GLFMPlatformData *platformData = display->platformData; ++ return platformData->eglContext; ++} ++ + #endif // __ANDROID__ diff --git a/subprojects/packagefiles/vulkan-headers/meson.build b/subprojects/packagefiles/vulkan-headers/meson.build new file mode 100644 index 0000000..f83e5e8 --- /dev/null +++ b/subprojects/packagefiles/vulkan-headers/meson.build @@ -0,0 +1,3 @@ +project('vulkan', 'c', version: '1.3.243') +vulkan = declare_dependency(include_directories: include_directories('include')) +meson.override_dependency('vulkan', vulkan) diff --git a/subprojects/packagefiles/vulkan/meson.build b/subprojects/packagefiles/vulkan/meson.build deleted file mode 100644 index f83e5e8..0000000 --- a/subprojects/packagefiles/vulkan/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('vulkan', 'c', version: '1.3.243') -vulkan = declare_dependency(include_directories: include_directories('include')) -meson.override_dependency('vulkan', vulkan) -- cgit v1.2.3-101-g0448