ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Platform: mark SDL 2.0.6 as oldest supported, drop older workarounds.

pull/651/head
Vladimír Vondruš 2 years ago
parent
a76b7646f0
commit
3e0724e7ec
3 changed files with 35 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      doc/changelog.dox
  2. 12
      src/Magnum/Platform/Sdl2Application.cpp
  3. 73
      src/Magnum/Platform/Sdl2Application.h

2
doc/changelog.dox
Unescape View File

@ -54,6 +54,8 @@ See also:
code paths were removed. code paths were removed.
- Support for Android API versions older than 14 (i.e., before Android 4.0, - Support for Android API versions older than 14 (i.e., before Android 4.0,
which is from 2011) has been dropped from @ref Platform::AndroidApplication. which is from 2011) has been dropped from @ref Platform::AndroidApplication.
- Support for SDL2 older than 2.0.6 (released in 2017) has been dropped from
@ref Platform::Sdl2Application.
@subsection changelog-latest-new New features @subsection changelog-latest-new New features

12
src/Magnum/Platform/Sdl2Application.cpp
Unescape View File

@ -343,9 +343,8 @@ Vector2 Sdl2Application::dpiScalingInternal(const Implementation::Sdl2DpiScaling
return dpiScaling; return dpiScaling;
/* Take a physical display DPI. On Linux it gets the (usually very off) /* Take a physical display DPI. On Linux it gets the (usually very off)
physical value from X11. Also only since SDL 2.0.4. */ physical value from X11. */
#elif defined(CORRADE_TARGET_UNIX) #elif defined(CORRADE_TARGET_UNIX)
#if SDL_VERSION_ATLEAST(2, 0, 4)
Vector2 dpi; Vector2 dpi;
if(SDL_GetDisplayDPI(0, nullptr, &dpi.x(), &dpi.y()) == 0) { if(SDL_GetDisplayDPI(0, nullptr, &dpi.x(), &dpi.y()) == 0) {
const Vector2 dpiScaling{dpi/96.0f}; const Vector2 dpiScaling{dpi/96.0f};
@ -354,9 +353,6 @@ Vector2 Sdl2Application::dpiScalingInternal(const Implementation::Sdl2DpiScaling
} }
Warning{} << "Platform::Sdl2Application: can't get physical display DPI, falling back to no scaling:" << SDL_GetError(); Warning{} << "Platform::Sdl2Application: can't get physical display DPI, falling back to no scaling:" << SDL_GetError();
#else
Debug{verbose} << "Platform::Sdl2Application: sorry, physical DPI scaling only available on SDL 2.0.4+";
#endif
return Vector2{1.0f}; return Vector2{1.0f};
/* HOWEVER, on Windows it gets the virtual DPI scaling, which we don't /* HOWEVER, on Windows it gets the virtual DPI scaling, which we don't
@ -393,7 +389,7 @@ void Sdl2Application::setWindowTitle(const Containers::StringView title) {
#endif #endif
} }
#if !defined(CORRADE_TARGET_EMSCRIPTEN) && SDL_MAJOR_VERSION*1000 + SDL_MINOR_VERSION*100 + SDL_PATCHLEVEL >= 2005 #ifndef CORRADE_TARGET_EMSCRIPTEN
void Sdl2Application::setWindowIcon(const ImageView2D& image) { void Sdl2Application::setWindowIcon(const ImageView2D& image) {
Uint32 format; /** @todo handle sRGB differently? */ Uint32 format; /** @todo handle sRGB differently? */
switch(image.format()) { switch(image.format()) {
@ -540,14 +536,10 @@ bool Sdl2Application::tryCreate(const Configuration& configuration, const GLConf
GLConfiguration::Flags glFlags = glConfiguration.flags(); GLConfiguration::Flags glFlags = glConfiguration.flags();
if((glFlags & GLConfiguration::Flag::GpuValidation) || (_context->configurationFlags() & GL::Context::Configuration::Flag::GpuValidation)) if((glFlags & GLConfiguration::Flag::GpuValidation) || (_context->configurationFlags() & GL::Context::Configuration::Flag::GpuValidation))
glFlags |= GLConfiguration::Flag::Debug; glFlags |= GLConfiguration::Flag::Debug;
#if SDL_MAJOR_VERSION*1000 + SDL_MINOR_VERSION*100 + SDL_PATCHLEVEL >= 2006
else if((glFlags & GLConfiguration::Flag::GpuValidationNoError) || (_context->configurationFlags() & GL::Context::Configuration::Flag::GpuValidationNoError)) else if((glFlags & GLConfiguration::Flag::GpuValidationNoError) || (_context->configurationFlags() & GL::Context::Configuration::Flag::GpuValidationNoError))
glFlags |= GLConfiguration::Flag::NoError; glFlags |= GLConfiguration::Flag::NoError;
#endif
#if SDL_MAJOR_VERSION*1000 + SDL_MINOR_VERSION*100 + SDL_PATCHLEVEL >= 2006
SDL_GL_SetAttribute(SDL_GL_CONTEXT_NO_ERROR, glFlags >= GLConfiguration::Flag::NoError); SDL_GL_SetAttribute(SDL_GL_CONTEXT_NO_ERROR, glFlags >= GLConfiguration::Flag::NoError);
#endif
/* Set context version, if user-specified */ /* Set context version, if user-specified */
if(glConfiguration.version() != GL::Version::None) { if(glConfiguration.version() != GL::Version::None) {

73
src/Magnum/Platform/Sdl2Application.h
Unescape View File

@ -210,7 +210,8 @@ final package along with a PowerShell script for easy local installation.
@section Platform-Sdl2Application-usage General usage @section Platform-Sdl2Application-usage General usage
This application library depends on the [SDL2](http://www.libsdl.org) library This application library depends on the [SDL2](http://www.libsdl.org) library
(Emscripten has it built in) and is built if `MAGNUM_WITH_SDL2APPLICATION` is version 2.0.6 and newer. On Emscripten, the builtin minimal SDL implementation
is used. The application library is built if `MAGNUM_WITH_SDL2APPLICATION` is
enabled when building Magnum. To use this library with CMake, request the enabled when building Magnum. To use this library with CMake, request the
`Sdl2Application` component of the `Magnum` package and link to the `Sdl2Application` component of the `Magnum` package and link to the
`Magnum::Sdl2Application` target: `Magnum::Sdl2Application` target:
@ -338,11 +339,11 @@ an exit event for it, instead of doing the usual application exit. This would
mean that if the application fails to set @ref ExitEvent::setAccepted() in an mean that if the application fails to set @ref ExitEvent::setAccepted() in an
@ref exitEvent() override for some reason, pressing @ref exitEvent() override for some reason, pressing
@m_class{m-label m-warning} **Ctrl** @m_class{m-label m-default} **C** would @m_class{m-label m-warning} **Ctrl** @m_class{m-label m-default} **C** would
not terminate it either and you'd have to forcibly kill it instead. When using not terminate it either and you'd have to forcibly kill it instead.
SDL >= 2.0.4, @ref Sdl2Application turns this behavior off, making @ref Sdl2Application turns this behavior off, making @ref exitEvent() behave
@ref exitEvent() behave consistently with other application implementations consistently with other application implementations such as
such as @ref GlfwApplication. You can turn this behavior back on by enabling @ref GlfwApplication. You can turn this behavior back on by enabling the
the [corresponding SDL hint](https://wiki.libsdl.org/SDL2/SDL_HINT_NO_SIGNAL_HANDLERS) [corresponding SDL hint](https://wiki.libsdl.org/SDL2/SDL_HINT_NO_SIGNAL_HANDLERS)
through an environment variable: through an environment variable:
@code{.sh} @code{.sh}
@ -404,12 +405,12 @@ the flag is not enabled, no canvas resizing is performed.
For OpenGL ES, SDL2 defaults to a "desktop GLES" context of the system driver. For OpenGL ES, SDL2 defaults to a "desktop GLES" context of the system driver.
Because Magnum has the opposite default behavior, if @ref MAGNUM_TARGET_GLES is Because Magnum has the opposite default behavior, if @ref MAGNUM_TARGET_GLES is
not defined and SDL >= 2.0.6 is used, @ref Sdl2Application sets the not defined, @ref Sdl2Application sets the `SDL_HINT_OPENGL_ES_DRIVER` hint to
`SDL_HINT_OPENGL_ES_DRIVER` hint to 1, forcing it to load symbols from a 1, forcing it to load symbols from a dedicated libGLES library instead, making
dedicated libGLES library instead, making SDL and Magnum consistently use the SDL and Magnum consistently use the same OpenGL entrypoints. This change also
same OpenGL entrypoints. This change also allows @ref platforms-gl-es-angle "ANGLE" allows @ref platforms-gl-es-angle "ANGLE" to be used on Windows simply by
to be used on Windows simply by placing the corresponding `libEGL.dll` and placing the corresponding `libEGL.dll` and `libGLESv2.dll` files next to the
`libGLESv2.dll` files next to the application executable. application executable.
@section Platform-Sdl2Application-dpi DPI awareness @section Platform-Sdl2Application-dpi DPI awareness
@ -874,7 +875,7 @@ class Sdl2Application {
*/ */
void setWindowTitle(Containers::StringView title); void setWindowTitle(Containers::StringView title);
#if !defined(CORRADE_TARGET_EMSCRIPTEN) && (SDL_MAJOR_VERSION*1000 + SDL_MINOR_VERSION*100 + SDL_PATCHLEVEL >= 2005 || defined(DOXYGEN_GENERATING_OUTPUT)) #ifndef CORRADE_TARGET_EMSCRIPTEN
/** /**
* @brief Set window icon * @brief Set window icon
* @m_since{2020,06} * @m_since{2020,06}
@ -885,12 +886,11 @@ class Sdl2Application {
* @ref PixelFormat::RGBA8Unorm or @ref PixelFormat::RGBA8Srgb formats. * @ref PixelFormat::RGBA8Unorm or @ref PixelFormat::RGBA8Srgb formats.
* Unlike @ref GlfwApplication::setWindowIcon(), SDL doesn't provide a * Unlike @ref GlfwApplication::setWindowIcon(), SDL doesn't provide a
* way to supply multiple images in different sizes. * way to supply multiple images in different sizes.
* @note Available since SDL 2.0.5. Not available on * @note Not available on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten",
* @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten", use * use @cb{.html} <link rel="icon"> @ce in your HTML markup
* @cb{.html} <link rel="icon"> @ce in your HTML markup instead. * instead. Although it's not documented in SDL itself, the
* Although it's not documented in SDL itself, the function might * function might have no effect on macOS / Wayland, similarly to
* have no effect on macOS / Wayland, similarly to how * how @ref GlfwApplication::setWindowIcon() behaves on those
* @ref GlfwApplication::setWindowIcon() behaves on those
* platforms. * platforms.
* @see @ref platform-windows-icon "Excecutable icon on Windows", * @see @ref platform-windows-icon "Excecutable icon on Windows",
* @ref Trade::IcoImporter "IcoImporter" * @ref Trade::IcoImporter "IcoImporter"
@ -1571,7 +1571,6 @@ class Sdl2Application::GLConfiguration: public GL::Context::Configuration {
*/ */
ResetIsolation = SDL_GL_CONTEXT_RESET_ISOLATION_FLAG, ResetIsolation = SDL_GL_CONTEXT_RESET_ISOLATION_FLAG,
#if SDL_MAJOR_VERSION*1000 + SDL_MINOR_VERSION*100 + SDL_PATCHLEVEL >= 2006 || defined(DOXYGEN_GENERATING_OUTPUT)
/** /**
* Context without error reporting. Might result in better * Context without error reporting. Might result in better
* performance, but situations that would have generated errors * performance, but situations that would have generated errors
@ -1580,7 +1579,6 @@ class Sdl2Application::GLConfiguration: public GL::Context::Configuration {
* flag is set or if the `--magnum-gpu-validation` @ref GL-Context-usage-command-line "command-line option" * flag is set or if the `--magnum-gpu-validation` @ref GL-Context-usage-command-line "command-line option"
* is set to `no-error`. * is set to `no-error`.
* *
* @note Available since SDL 2.0.6.
* @requires_gles Context flags are not available in WebGL. * @requires_gles Context flags are not available in WebGL.
* @m_since_latest * @m_since_latest
*/ */
@ -1588,7 +1586,6 @@ class Sdl2Application::GLConfiguration: public GL::Context::Configuration {
handling manually. */ handling manually. */
NoError = 1ull << 32, NoError = 1ull << 32,
#endif #endif
#endif
/** /**
* @copydoc GL::Context::Configuration::Flag::QuietLog * @copydoc GL::Context::Configuration::Flag::QuietLog
@ -1910,14 +1907,12 @@ class Sdl2Application::Configuration {
GLFW_FOCUSED (exposed as Focused) and GLFW_FOCUS_ON_SHOW (not GLFW_FOCUSED (exposed as Focused) and GLFW_FOCUS_ON_SHOW (not
exposed) -- what's the relation? How to make these compatible? */ exposed) -- what's the relation? How to make these compatible? */
#if SDL_MAJOR_VERSION*1000 + SDL_MINOR_VERSION*100 + SDL_PATCHLEVEL >= 2005 || defined(DOXYGEN_GENERATING_OUTPUT)
/** /**
* Always on top * Always on top
* @m_since{2020,06} * @m_since{2020,06}
* *
* @note Available since SDL 2.0.5, not available on * @note Not available on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten".
* @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten". According to * According to SDL docs works only on X11.
* SDL docs works only on X11.
*/ */
AlwaysOnTop = SDL_WINDOW_ALWAYS_ON_TOP, AlwaysOnTop = SDL_WINDOW_ALWAYS_ON_TOP,
@ -1925,9 +1920,8 @@ class Sdl2Application::Configuration {
* Don't add the window to taskbar * Don't add the window to taskbar
* @m_since{2020,06} * @m_since{2020,06}
* *
* @note Available since SDL 2.0.5, not available on * @note Not available on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten".
* @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten". According to * According to SDL docs works only on X11.
* SDL docs works only on X11.
*/ */
SkipTaskbar = SDL_WINDOW_SKIP_TASKBAR, SkipTaskbar = SDL_WINDOW_SKIP_TASKBAR,
@ -1935,9 +1929,8 @@ class Sdl2Application::Configuration {
* Window should be treated as a utility window * Window should be treated as a utility window
* @m_since{2020,06} * @m_since{2020,06}
* *
* @note Available since SDL 2.0.5, not available on * @note Not available on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten".
* @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten". According to * According to SDL docs works only on X11.
* SDL docs works only on X11.
*/ */
Utility = SDL_WINDOW_UTILITY, Utility = SDL_WINDOW_UTILITY,
@ -1945,9 +1938,8 @@ class Sdl2Application::Configuration {
* Window should be treated as a tooltip * Window should be treated as a tooltip
* @m_since{2020,06} * @m_since{2020,06}
* *
* @note Available since SDL 2.0.5, not available on * @note Not available on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten".
* @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten". According to * According to SDL docs works only on X11.
* SDL docs works only on X11.
*/ */
Tooltip = SDL_WINDOW_TOOLTIP, Tooltip = SDL_WINDOW_TOOLTIP,
@ -1955,13 +1947,11 @@ class Sdl2Application::Configuration {
* Window should be treated as a popup menu * Window should be treated as a popup menu
* @m_since{2020,06} * @m_since{2020,06}
* *
* @note Available since SDL 2.0.5, not available on * @note Not available on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten".
* @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten". According to * According to SDL docs works only on X11.
* SDL docs works only on X11.
*/ */
PopupMenu = SDL_WINDOW_POPUP_MENU, PopupMenu = SDL_WINDOW_POPUP_MENU,
#endif #endif
#endif
/** /**
* Do not create any GPU context. Use together with * Do not create any GPU context. Use together with
@ -1986,12 +1976,11 @@ class Sdl2Application::Configuration {
*/ */
OpenGL = SDL_WINDOW_OPENGL, OpenGL = SDL_WINDOW_OPENGL,
#if !defined(CORRADE_TARGET_EMSCRIPTEN) && (SDL_MAJOR_VERSION*1000 + SDL_MINOR_VERSION*100 + SDL_PATCHLEVEL >= 2006 || defined(DOXYGEN_GENERATING_OUTPUT)) #ifndef CORRADE_TARGET_EMSCRIPTEN
/** /**
* Request a window for use with Vulkan. Useful in combination with * Request a window for use with Vulkan. Useful in combination with
* @ref WindowFlag::Contextless. * @ref WindowFlag::Contextless.
* @note Available since SDL 2.0.6, not available on * @note Not available on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten".
* @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten".
* @m_since{2019,10} * @m_since{2019,10}
*/ */
Vulkan = SDL_WINDOW_VULKAN Vulkan = SDL_WINDOW_VULKAN

Write Preview
Loading…
Cancel
Save