From d9f723fbbff0fbe5ce8968007dc2bbf1d891ab2f Mon Sep 17 00:00:00 2001 From: knokko Date: Wed, 2 Feb 2022 21:04:35 +0100 Subject: [PATCH] EGL: Add glfwGetEGLConfig --- README.md | 1 + docs/news.dox | 7 +++++++ include/GLFW/glfw3native.h | 17 +++++++++++++++++ src/egl_context.c | 13 +++++++++++++ 4 files changed, 38 insertions(+) diff --git a/README.md b/README.md index fe222f27..8713fe65 100644 --- a/README.md +++ b/README.md @@ -303,6 +303,7 @@ information on what to include when reporting a bug. - [EGL] Added ANGLE backend selection via `EGL_ANGLE_platform_angle` extension (#1380) - [EGL] Bugfix: The `GLFW_DOUBLEBUFFER` context attribute was ignored (#1843) + - [EGL] Made it possible to query the `EGLConfig` that was chosen to create a given window via `glfwGetEGLConfig` - [GLX] Made it possible to query the `GLXFBConfig` that was chosen to create a given window via `glfwGetGLXFBConfig` diff --git a/docs/news.dox b/docs/news.dox index decd888d..3f4fdd05 100644 --- a/docs/news.dox +++ b/docs/news.dox @@ -77,6 +77,12 @@ GLFW now provides the [glfwGetGLXFBConfig](@ref glfwGetGLXFBConfig) function that returns the GLXFBConfig that was chosen to create the given window handle. +@subsubsection features_34_egl_getconfig Query EGLConfig + +GLFW now provides the [glfwGetEGLConfig](@ref glfwGetEGLConfig) +function that returns the EGLConfig that was chosen to create the +given window handle. + @subsection caveats_34 Caveats for version 3.4 @subsection caveats Caveats for version 3.4 @@ -185,6 +191,7 @@ then GLFW will fail to initialize. @subsubsection functions_34 New functions in version 3.4 - @ref glfwGetGLXFBConfig + - @ref glfwGetEGLConfig - @ref glfwInitAllocator - @ref glfwGetPlatform - @ref glfwPlatformSupported diff --git a/include/GLFW/glfw3native.h b/include/GLFW/glfw3native.h index 334dabf0..f886e60b 100644 --- a/include/GLFW/glfw3native.h +++ b/include/GLFW/glfw3native.h @@ -532,6 +532,23 @@ GLFWAPI EGLContext glfwGetEGLContext(GLFWwindow* window); * @ingroup native */ GLFWAPI EGLSurface glfwGetEGLSurface(GLFWwindow* window); + +/*! @brief Returns the `EGLConfig` of the specified window. + * + * @return The `EGLConfig` of the specified window, or `EGL_NO_SURFACE` if an + * [error](@ref error_handling) occurred. + * + * @errors Possible errors include @ref GLFW_NO_WINDOW_CONTEXT and @ref + * GLFW_NOT_INITIALIZED. + * + * @thread_safety This function may be called from any thread. Access is not + * synchronized. + * + * @since Added in version 3.0. + * + * @ingroup native + */ +GLFWAPI EGLConfig glfwGetEGLConfig(GLFWwindow* window); #endif #if defined(GLFW_EXPOSE_NATIVE_OSMESA) diff --git a/src/egl_context.c b/src/egl_context.c index 89ea78fa..502e488e 100644 --- a/src/egl_context.c +++ b/src/egl_context.c @@ -866,3 +866,16 @@ GLFWAPI EGLSurface glfwGetEGLSurface(GLFWwindow* handle) return window->context.egl.surface; } +GLFWAPI EGLConfig glfwGetEGLConfig(GLFWwindow* handle) +{ + _GLFWwindow* window = (_GLFWwindow*) handle; + _GLFW_REQUIRE_INIT_OR_RETURN(EGL_NO_SURFACE); + + if (window->context.source != GLFW_EGL_CONTEXT_API) + { + _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL); + return EGL_NO_SURFACE; + } + + return window->context.egl.config; +}