From 08803885e7cc35208e6970e6bec2b0bb4834f36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 21 Sep 2020 16:00:47 +0200 Subject: [PATCH] Doc++, updated changelog. --- doc/changelog.dox | 3 +++ src/Magnum/Platform/GlfwApplication.cpp | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/doc/changelog.dox b/doc/changelog.dox index 0083b0ff5..53720142c 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -129,6 +129,9 @@ See also: - Added a @ref Platform::GlfwApplication::setWindowIcon() overload taking a @ref Corrade::Containers::ArrayView in addition to @ref std::initializer_list +- @ref Platform::GlfwApplication now defaults to EGL on + @ref MAGNUM_TARGET_DESKTOP_GLES "non-desktop" + @ref MAGNUM_TARGET_GLES "GLES builds" (see [mosra/magnum#470](https://github.com/mosra/magnum/pull/470)) @subsubsection changelog-latest-changes-shaders Shaders library diff --git a/src/Magnum/Platform/GlfwApplication.cpp b/src/Magnum/Platform/GlfwApplication.cpp index a9e13c4fe..15aa750c9 100644 --- a/src/Magnum/Platform/GlfwApplication.cpp +++ b/src/Magnum/Platform/GlfwApplication.cpp @@ -451,6 +451,9 @@ bool GlfwApplication::tryCreate(const Configuration& configuration, const GLConf } #else glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API); + /* Force EGL on Windows and non-desktop GLES -- needed by ANGLE: + https://stackoverflow.com/a/58904181/4084782 . Might be useful on + other platforms as well (Mac?), not tested yet. */ #if defined(CORRADE_TARGET_WINDOWS) && !defined(MAGNUM_TARGET_DESKTOP_GLES) glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API); #endif @@ -478,6 +481,9 @@ bool GlfwApplication::tryCreate(const Configuration& configuration, const GLConf #endif glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0); glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API); + /* Force EGL on Windows and non-desktop GLES -- needed by ANGLE: + https://stackoverflow.com/a/58904181/4084782 . Might be useful on + other platforms as well (Mac?), not tested yet. */ #if defined(CORRADE_TARGET_WINDOWS) && !defined(MAGNUM_TARGET_DESKTOP_GLES) glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API); #endif