Browse Source

Doc++, updated changelog.

pull/481/head
Vladimír Vondruš 6 years ago
parent
commit
08803885e7
  1. 3
      doc/changelog.dox
  2. 6
      src/Magnum/Platform/GlfwApplication.cpp

3
doc/changelog.dox

@ -129,6 +129,9 @@ See also:
- Added a @ref Platform::GlfwApplication::setWindowIcon() overload taking a - Added a @ref Platform::GlfwApplication::setWindowIcon() overload taking a
@ref Corrade::Containers::ArrayView in addition to @ref std::initializer_list @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 @subsubsection changelog-latest-changes-shaders Shaders library

6
src/Magnum/Platform/GlfwApplication.cpp

@ -451,6 +451,9 @@ bool GlfwApplication::tryCreate(const Configuration& configuration, const GLConf
} }
#else #else
glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API); 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) #if defined(CORRADE_TARGET_WINDOWS) && !defined(MAGNUM_TARGET_DESKTOP_GLES)
glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API); glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API);
#endif #endif
@ -478,6 +481,9 @@ bool GlfwApplication::tryCreate(const Configuration& configuration, const GLConf
#endif #endif
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API); 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) #if defined(CORRADE_TARGET_WINDOWS) && !defined(MAGNUM_TARGET_DESKTOP_GLES)
glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API); glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API);
#endif #endif

Loading…
Cancel
Save