diff --git a/CMakeLists.txt b/CMakeLists.txt index 846da4064..00b74a323 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,7 +114,7 @@ if(CORRADE_TARGET_ANDROID) elseif(CORRADE_TARGET_IOS) option(WITH_WINDOWLESSIOSAPPLICATION "Build WindowlessIosApplication library" OFF) -# OS X-specific application libraries +# macOS-specific application libraries elseif(CORRADE_TARGET_APPLE) cmake_dependent_option(WITH_WINDOWLESSCGLAPPLICATION "Build WindowlessCglApplication library" OFF "NOT WITH_MAGNUMINFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON) option(WITH_CGLCONTEXT "Build CglContext library" OFF) diff --git a/CREDITS.md b/CREDITS.md index eeff001c8..034830746 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -17,19 +17,19 @@ Contributors to Magnum library ------------------------------ * Miguel Martin ([@miguelmartin75](https://github.com/miguelmartin75)) -- - initial Mac OS X port, various other improvements + initial macOS port, various other improvements * Travis Watkins ([@amaranth](https://github.com/amaranth)) -- support for - windowless applications under Mac OS X + windowless applications under macOS * [@ArEnSc](https://github.com/ArEnSc) / [@michael-chung](https://github.com/michael-chung) -- - initial implementation of windowless applications under Mac OS X, Mac OS X + initial implementation of windowless applications under macOS, macOS port improvements -* Stefan Wasilewski ([@smw](https://github.com/smw)) -- Mac OS X port +* Stefan Wasilewski ([@smw](https://github.com/smw)) -- macOS port improvements * Konstantinos Chatzilygeroudis ([@costashatz](https://github.com/costashatz)) -- Debian package * Olga Turanksaya ([@olga-python](https://github.com/olga-python)) -- Gentoo ebuild -* [@wivlaro](https://github.com/wivlaro) -- numerous bug reports, Mac OS X +* [@wivlaro](https://github.com/wivlaro) -- numerous bug reports, macOS fixes, feature improvements * Jonathan Hale ([@Squareys](https://github.com/Squareys)) -- Audio library enhancements, GlfwApplication implementation, frustum culling, bug reports, diff --git a/README.md b/README.md index 9ba554542..3a4f84809 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Platforms: * **Linux** and embedded Linux (natively using GLX/EGL and Xlib or through SDL2, GLFW or GLUT toolkit) [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum) [![Coverage Status](https://coveralls.io/repos/github/mosra/magnum/badge.svg?branch=master)](https://coveralls.io/github/mosra/magnum?branch=master) * **Windows** on both MSVC and MinGW, natively or using ANGLE (through SDL2, GLFW or GLUT toolkit) [![Build Status](https://ci.appveyor.com/api/projects/status/5b477m034cfaskse/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum/branch/master) -* **OS X** (through SDL2 or GLFW toolkit) [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum) +* **macOS** (through SDL2 or GLFW toolkit) [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum) * **iOS** (through SDL2 toolkit) [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum) * **Android** 2.3 (API Level 9) and higher [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum) * **Windows RT** (Store/Phone) using ANGLE (through SDL2 toolkit) [![Build Status](https://ci.appveyor.com/api/projects/status/5b477m034cfaskse/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum/branch/master) @@ -152,23 +152,23 @@ separate repositories. * **Corrade** -- main Magnum dependency, multiplatform utility library: https://github.com/mosra/corrade - [![Linux/OSX Build Status](https://travis-ci.org/mosra/corrade.svg?branch=master)](https://travis-ci.org/mosra/corrade) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/afjjlsgtk6jjxulp/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/corrade/branch/master) + [![Linux/macOS/iOS/Android/Emscripten Build Status](https://travis-ci.org/mosra/corrade.svg?branch=master)](https://travis-ci.org/mosra/corrade) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/afjjlsgtk6jjxulp/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/corrade/branch/master) * **Magnum Bootstrap** -- bootstrap projects for many use cases, helping you get up and running in no time: https://github.com/mosra/magnum-bootstrap * **Magnum Plugins** -- various importer plugins for image, font, audio and 3D model formats is at https://github.com/mosra/magnum-plugins - [![Linux/OSX Build Status](https://travis-ci.org/mosra/magnum-plugins.svg?branch=master)](https://travis-ci.org/mosra/magnum-plugins) [![Windows Build status](https://ci.appveyor.com/api/projects/status/nkdlwaxm2i9d6vpx/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum-plugins/branch/master) + [![Linux/macOS/iOS/Android/Emscripten Build Status](https://travis-ci.org/mosra/magnum-plugins.svg?branch=master)](https://travis-ci.org/mosra/magnum-plugins) [![Windows Build status](https://ci.appveyor.com/api/projects/status/nkdlwaxm2i9d6vpx/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum-plugins/branch/master) * **Magnum Integration** -- integration with various external math and physics, get it at https://github.com/mosra/magnum-integration - [![Linux/OSX Build Status](https://travis-ci.org/mosra/magnum-integration.svg?branch=master)](https://travis-ci.org/mosra/magnum-integration) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/hs6ykva1ld74vavr/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum-integration/branch/master) + [![Linux/macOS/iOS/Android/Emscripten Build Status](https://travis-ci.org/mosra/magnum-integration.svg?branch=master)](https://travis-ci.org/mosra/magnum-integration) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/hs6ykva1ld74vavr/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum-integration/branch/master) * **Magnum Examples** -- examples of engine usage, varying from simple *Hello World*-like example to more advanced applications, such as viewer for complex 3D models. See it at https://github.com/mosra/magnum-examples - [![Linux/OSX Build Status](https://travis-ci.org/mosra/magnum-examples.svg?branch=master)](https://travis-ci.org/mosra/magnum-examples) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/33qdqpdc5n0au3ou/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum-examples/branch/master) + [![LLinux/macOS/iOS/Android/Emscripten Build Status](https://travis-ci.org/mosra/magnum-examples.svg?branch=master)](https://travis-ci.org/mosra/magnum-examples) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/33qdqpdc5n0au3ou/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum-examples/branch/master) * **Magnum Extras** -- playground for testing new APIs, specialized stuff that doesn't necessarily need to be a part of main Magnum repository or mutually exclusive functionality: https://github.com/mosra/magnum-extras - [![Linux/OSX Build Status](https://travis-ci.org/mosra/magnum-extras.svg?branch=master)](https://travis-ci.org/mosra/magnum-extras) [![Windows Build status](https://ci.appveyor.com/api/projects/status/f75u5eow2qiso7m5/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum-extras/branch/master) + [![Linux/macOS/iOS/Android/Emscripten Build Status](https://travis-ci.org/mosra/magnum-extras.svg?branch=master)](https://travis-ci.org/mosra/magnum-extras) [![Windows Build status](https://ci.appveyor.com/api/projects/status/f75u5eow2qiso7m5/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum-extras/branch/master) * **libRocket integration** -- integrates Magnum as rendering backend into [libRocket](https://github.com/libRocket/libRocket) GUI library: https://github.com/miguelmartin75/Magnum-libRocket diff --git a/doc/building.dox b/doc/building.dox index 10f2c9054..bd7c10676 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -373,7 +373,7 @@ features, for example), modify the last entry in `debian/rules`. @subsection building-packages-brew Homebrew formulas -OS X Homebrew formulas are in `package/homebrew` directory. Either use the +macOS Homebrew formulas are in `package/homebrew` directory. Either use the `*.rb` files directly or use the tap at https://github.com/mosra/homebrew-magnum : brew install --HEAD mosra/magnum/magnum @@ -523,7 +523,7 @@ building your projects for Emscripten. @subsection building-cross-ios Crosscompiling for iOS -You will need OSX and Xcode installed. +You will need macOS and Xcode installed. Set `CMAKE_OSX_ROOT` to SDK you want to target and enable all desired architectures in `CMAKE_OSX_ARCHITECTURES`. Be sure to set `CMAKE_INSTALL_PREFIX` @@ -609,7 +609,7 @@ building your projects for Android. @subsection building-ci-travis Travis -In `package/ci/` there is a `travis.yml` file with Linux GCC 4.7, OSX Clang, +In `package/ci/` there is a `travis.yml` file with Linux GCC 4.7, macOS Clang, Linux desktop GLES2/GLES3, iOS GLES2/GLES3, Emscripten WebGL1/WebGL2, Android GLES2/GLES3, AddressSanitizer and ThreadSanitizer configuration. Online at https://travis-ci.org/mosra/magnum. The Linux build has code coverage diff --git a/doc/mainpage.dox b/doc/mainpage.dox index fe7024523..5b6f2aa5a 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -79,7 +79,8 @@ Platforms: - **Linux** and embedded Linux (natively using GLX/EGL and Xlib or through SDL2, GLFW or GLUT toolkit) - **Windows** using both MSVC and MinGW, natively or using ANGLE (through SDL2, GLFW or GLUT toolkit) -- **OS X**, **iOS** (through SDL2 or GLFW toolkit) +- **macOS** (through SDL2 or GLFW toolkit) +- **iOS** (through SDL2 toolkit) - **Android** 2.3 (API Level 9) and higher - **Windows RT** (Store/Phone) using ANGLE (through SDL2 toolkit) - **HTML5/JavaScript** (through [Emscripten](https://github.com/kripken/emscripten/wiki)) diff --git a/doc/platform.dox b/doc/platform.dox index 1f74b7073..7d44452bb 100644 --- a/doc/platform.dox +++ b/doc/platform.dox @@ -125,7 +125,7 @@ void MyApplication::viewportEvent(const Vector2i& size) { Windowless applications provide just a context for ofscreen rendering or performing tasks on GPU. There is not yet any platform-independent toolkit which could handle this in portable way, thus you have to use platform-specific -ones. Magnum provides windowless applications for X11-based Unix, OS X and +ones. Magnum provides windowless applications for X11-based Unix, macOS and Windows. To make things simple, as an example we will use only @ref Platform::WindowlessGlxApplication, see link for bootstrap application below for fully portable example. @@ -148,7 +148,7 @@ Barebone application which will just print out current OpenGL version and renderer string and exits is in the following code listing. @note Fully contained windowless application using @ref Platform::WindowlessCglApplication - on OS X, @ref Platform::WindowlessGlxApplication on Unix and + on macOS, @ref Platform::WindowlessGlxApplication on Unix and @ref Platform::WindowlessWglApplication on Windows along with CMake setup is available in `windowless` branch of [Magnum Bootstrap](https://github.com/mosra/magnum-bootstrap) repository. @@ -295,7 +295,7 @@ pointer loading using platform-specific APIs. In that case you also need to find particular `*Context` library, add its include dir and then link to it. These platform-specific libraries are available: -- `CglContext` -- CGL context (Mac OS X) +- `CglContext` -- CGL context (macOS) - `EglContext` -- EGL context (everywhere except Emscripten) - `GlxContext` -- GLX context (X11-based Unix) - `WglContext` -- WGL context (Windows) diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake index ef1040ab7..d19767221 100644 --- a/modules/FindCorrade.cmake +++ b/modules/FindCorrade.cmake @@ -73,7 +73,7 @@ # CORRADE_BUILD_STATIC - Defined if compiled as static libraries. # Default are shared libraries. # CORRADE_TARGET_UNIX - Defined if compiled for some Unix flavor -# (Linux, BSD, OS X) +# (Linux, BSD, macOS) # CORRADE_TARGET_APPLE - Defined if compiled for Apple platforms # CORRADE_TARGET_IOS - Defined if compiled for iOS (device or # simulator) diff --git a/modules/FindEGL.cmake b/modules/FindEGL.cmake index ca19c12f3..384611463 100644 --- a/modules/FindEGL.cmake +++ b/modules/FindEGL.cmake @@ -61,7 +61,7 @@ find_package_handle_standard_args(EGL DEFAULT_MSG EGL_INCLUDE_DIR) if(NOT TARGET EGL::EGL) - # Work around BUGGY framework support on OSX + # Work around BUGGY framework support on macOS # http://public.kitware.com/pipermail/cmake/2016-April/063179.html if(APPLE AND ${EGL_LIBRARY} MATCHES "\\.framework$") add_library(EGL::EGL INTERFACE IMPORTED) diff --git a/modules/FindGLFW.cmake b/modules/FindGLFW.cmake index a2d2c9e6e..483c41f9b 100644 --- a/modules/FindGLFW.cmake +++ b/modules/FindGLFW.cmake @@ -70,7 +70,7 @@ if(NOT TARGET GLFW::GLFW) endif() add_library(GLFW::GLFW ${_GLFW_IMPORTED_LIBRARY_KIND}) - # Work around BUGGY framework support on OSX + # Work around BUGGY framework support on macOS # https://cmake.org/Bug/view.php?id=14105 if(CORRADE_TARGET_APPLE AND ${GLFW_LIBRARY} MATCHES "\\.framework$") set_property(TARGET GLFW::GLFW PROPERTY IMPORTED_LOCATION ${GLFW_LIBRARY}/GLFW) diff --git a/modules/FindOpenAL.cmake b/modules/FindOpenAL.cmake index 21a52fecc..e071d0c27 100644 --- a/modules/FindOpenAL.cmake +++ b/modules/FindOpenAL.cmake @@ -90,13 +90,13 @@ # This version is modified for Magnum and was forked from # https://github.com/Kitware/CMake/blob/v3.6.1/Modules/FindOpenAL.cmake # The file was modified to add a new path suffix for finding OpenAL for -# Emscripten on OSX and, in case of Emscripten, the library is not looked for +# Emscripten on macOS and, in case of Emscripten, the library is not looked for # as it is linked in implicitly. find_path(OPENAL_INCLUDE_DIR al.h HINTS ENV OPENALDIR - # The AL was added in order to make the module working for Emscripten on OSX. + # The AL was added in order to make the module working for Emscripten on macOS. # Not sure why include/AL wasn't enough. PATH_SUFFIXES include/AL include/OpenAL include AL PATHS diff --git a/modules/FindOpenGLES2.cmake b/modules/FindOpenGLES2.cmake index 65e9ffbe7..23445135d 100644 --- a/modules/FindOpenGLES2.cmake +++ b/modules/FindOpenGLES2.cmake @@ -66,7 +66,7 @@ find_package_handle_standard_args(OpenGLES2 DEFAULT_MSG if(NOT TARGET OpenGLES2::OpenGLES2) if(OPENGLES2_LIBRARY_NEEDED) - # Work around BUGGY framework support on OSX + # Work around BUGGY framework support on macOS # http://public.kitware.com/pipermail/cmake/2016-April/063179.html if(CORRADE_TARGET_APPLE AND ${OPENGLES2_LIBRARY} MATCHES "\\.framework$") add_library(OpenGLES2::OpenGLES2 INTERFACE IMPORTED) diff --git a/modules/FindOpenGLES3.cmake b/modules/FindOpenGLES3.cmake index edab52338..85b935c14 100644 --- a/modules/FindOpenGLES3.cmake +++ b/modules/FindOpenGLES3.cmake @@ -70,7 +70,7 @@ find_package_handle_standard_args("OpenGLES3" DEFAULT_MSG if(NOT TARGET OpenGLES3::OpenGLES3) if(OPENGLES3_LIBRARY_NEEDED) - # Work around BUGGY framework support on OSX + # Work around BUGGY framework support on macOS # http://public.kitware.com/pipermail/cmake/2016-April/063179.html if(CORRADE_TARGET_APPLE AND ${OPENGLES3_LIBRARY} MATCHES "\\.framework$") add_library(OpenGLES3::OpenGLES3 INTERFACE IMPORTED) diff --git a/modules/FindSDL2.cmake b/modules/FindSDL2.cmake index 2a385b0d7..0c9f31852 100644 --- a/modules/FindSDL2.cmake +++ b/modules/FindSDL2.cmake @@ -51,7 +51,7 @@ else() endif() find_library(SDL2_LIBRARY - # Compiling SDL2 from scratch on OSX creates dead libSDL2.so symlink + # Compiling SDL2 from scratch on macOS creates dead libSDL2.so symlink # which CMake somehow prefers before the SDL2-2.0.dylib file. Making # the dylib first so it is preferred. NAMES SDL2-2.0 SDL2 @@ -66,9 +66,9 @@ find_path(SDL2_INCLUDE_DIR # Apparently when both SDL.h and SDL_scancode.h are specified, CMake is # happy enough that it found SDL.h and doesn't bother about the other. # - # On OSX, where the includes are not in SDL2/SDL.h form (which would solve - # this issue), but rather SDL2.framework/Headers/SDL.h, CMake might find - # SDL.framework/Headers/SDL.h if SDL1 is installed, which is wrong. + # On macOS, where the includes are not in SDL2/SDL.h form (which would + # solve this issue), but rather SDL2.framework/Headers/SDL.h, CMake might + # find SDL.framework/Headers/SDL.h if SDL1 is installed, which is wrong. NAMES SDL_scancode.h PATH_SUFFIXES ${_SDL2_PATH_SUFFIXES}) @@ -118,7 +118,7 @@ if(NOT TARGET SDL2::SDL2) endif() add_library(SDL2::SDL2 ${_SDL2_IMPORTED_LIBRARY_KIND}) - # Work around BUGGY framework support on OSX + # Work around BUGGY framework support on macOS # https://cmake.org/Bug/view.php?id=14105 if(CORRADE_TARGET_APPLE AND ${SDL2_LIBRARY} MATCHES "\\.framework$") set_property(TARGET SDL2::SDL2 PROPERTY IMPORTED_LOCATION ${SDL2_LIBRARY}/SDL2) diff --git a/src/Magnum/Implementation/driverSpecific.cpp b/src/Magnum/Implementation/driverSpecific.cpp index ed2e32a62..37fab0793 100644 --- a/src/Magnum/Implementation/driverSpecific.cpp +++ b/src/Magnum/Implementation/driverSpecific.cpp @@ -62,7 +62,7 @@ namespace { #ifndef MAGNUM_TARGET_GLES /* Layout qualifier causes compiler error with GLSL 1.20 on Mesa, GLSL - 1.30 on NVidia and 1.40 on Mac OS X. Everything is fine when using + 1.30 on NVidia and 1.40 on macOS. Everything is fine when using newer GLSL version. */ "no-layout-qualifiers-on-old-glsl", diff --git a/src/Magnum/OpenGLTester.cpp b/src/Magnum/OpenGLTester.cpp index 6a219a432..9fa62dfb3 100644 --- a/src/Magnum/OpenGLTester.cpp +++ b/src/Magnum/OpenGLTester.cpp @@ -33,7 +33,7 @@ namespace Magnum { OpenGLTester::OpenGLTester(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, _windowlessApplication{{arguments().first, arguments().second}} { /* Try to create debug context, fallback to normal one if not possible. No - such thing on OSX or iOS. */ + such thing on macOS or iOS. */ #ifndef CORRADE_TARGET_APPLE if(!_windowlessApplication.tryCreateContext(Platform::WindowlessApplication::Configuration{}.setFlags(Platform::WindowlessApplication::Configuration::Flag::Debug))) _windowlessApplication.createContext(); diff --git a/src/Magnum/Platform/GlutApplication.h b/src/Magnum/Platform/GlutApplication.h index 22e0ceb3c..789d6afd6 100644 --- a/src/Magnum/Platform/GlutApplication.h +++ b/src/Magnum/Platform/GlutApplication.h @@ -50,8 +50,8 @@ Application using GLUT toolkit. Supports keyboard and mouse handling with support for changing cursor and mouse tracking and warping. This application library is available only on desktop OpenGL (Linux, Windows, -OS X). It depends on **GLUT** library and is built if `WITH_GLUTAPPLICATION` is -enabled in CMake. +macOS). It depends on **GLUT** library and is built if `WITH_GLUTAPPLICATION` +is enabled in CMake. ## Bootstrap application diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp index a6465be1b..b0b8cd20b 100644 --- a/src/Magnum/Platform/Sdl2Application.cpp +++ b/src/Magnum/Platform/Sdl2Application.cpp @@ -121,10 +121,10 @@ bool Sdl2Application::tryCreateContext(const Configuration& configuration) { /* Request usable version otherwise */ } else { #ifndef MAGNUM_TARGET_GLES - /* First try to create core context. This is needed mainly on OS X and + /* First try to create core context. This is needed mainly on macOS and Mesa, as support for recent OpenGL versions isn't implemented in compatibility contexts (which are the default). At least GL 3.2 is - needed on OSX, at least GL 3.1 is needed on Mesa. Bite the bullet + needed on macOS, at least GL 3.1 is needed on Mesa. Bite the bullet and try 3.1 also elsewhere. */ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); #ifdef CORRADE_TARGET_APPLE diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index b15fb8484..2d5219aff 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -436,8 +436,8 @@ class Sdl2Application { * alternative. * * On desktop GL, if version is not specified in @p configuration, the - * application first tries to create core context (OpenGL 3.2+ on OS X, - * OpenGL 3.1+ elsewhere) and if that fails, falls back to + * application first tries to create core context (OpenGL 3.2+ on + * macOS, OpenGL 3.1+ elsewhere) and if that fails, falls back to * compatibility OpenGL 2.1 context. */ #ifdef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Magnum/Platform/WindowlessCglApplication.h b/src/Magnum/Platform/WindowlessCglApplication.h index d0c631f4a..1004aa7a0 100644 --- a/src/Magnum/Platform/WindowlessCglApplication.h +++ b/src/Magnum/Platform/WindowlessCglApplication.h @@ -136,7 +136,7 @@ class WindowlessCglContext::Configuration { @brief Windowless CGL application Application for offscreen rendering using @ref WindowlessCglContext. This -application library is available on desktop OpenGL on OS X. It is built if +application library is available on desktop OpenGL on macOS. It is built if `WITH_WINDOWLESSCGLAPPLICATION` is enabled in CMake. ## Bootstrap application diff --git a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp index 870a66ec3..820df0128 100644 --- a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp @@ -44,7 +44,7 @@ void DistanceFieldVectorGLTest::compile2D() { Shaders::DistanceFieldVector2D shader; { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -54,7 +54,7 @@ void DistanceFieldVectorGLTest::compile3D() { Shaders::DistanceFieldVector3D shader; { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } diff --git a/src/Magnum/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp index 0891d9f8a..4d2ea0fcc 100644 --- a/src/Magnum/Shaders/Test/FlatGLTest.cpp +++ b/src/Magnum/Shaders/Test/FlatGLTest.cpp @@ -48,7 +48,7 @@ void FlatGLTest::compile2D() { Shaders::Flat2D shader; { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -58,7 +58,7 @@ void FlatGLTest::compile3D() { Shaders::Flat3D shader; { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -68,7 +68,7 @@ void FlatGLTest::compile2DTextured() { Shaders::Flat2D shader(Shaders::Flat2D::Flag::Textured); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -78,7 +78,7 @@ void FlatGLTest::compile3DTextured() { Shaders::Flat3D shader(Shaders::Flat3D::Flag::Textured); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index ad6c5ab85..51ca4225b 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -52,7 +52,7 @@ void MeshVisualizerGLTest::compile() { Shaders::MeshVisualizer shader; { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -76,7 +76,7 @@ void MeshVisualizerGLTest::compileWireframeGeometryShader() { Shaders::MeshVisualizer shader(Shaders::MeshVisualizer::Flag::Wireframe); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -87,7 +87,7 @@ void MeshVisualizerGLTest::compileWireframeNoGeometryShader() { Shaders::MeshVisualizer shader(Shaders::MeshVisualizer::Flag::Wireframe|Shaders::MeshVisualizer::Flag::NoGeometryShader); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } diff --git a/src/Magnum/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp index 816a19e50..712b1e8b0 100644 --- a/src/Magnum/Shaders/Test/PhongGLTest.cpp +++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp @@ -56,7 +56,7 @@ void PhongGLTest::compile() { Shaders::Phong shader; { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -66,7 +66,7 @@ void PhongGLTest::compileAmbientTexture() { Shaders::Phong shader(Shaders::Phong::Flag::AmbientTexture); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -76,7 +76,7 @@ void PhongGLTest::compileDiffuseTexture() { Shaders::Phong shader(Shaders::Phong::Flag::DiffuseTexture); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -86,7 +86,7 @@ void PhongGLTest::compileSpecularTexture() { Shaders::Phong shader(Shaders::Phong::Flag::SpecularTexture); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -96,7 +96,7 @@ void PhongGLTest::compileAmbientDiffuseTexture() { Shaders::Phong shader(Shaders::Phong::Flag::AmbientTexture|Shaders::Phong::Flag::DiffuseTexture); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -106,7 +106,7 @@ void PhongGLTest::compileAmbientSpecularTexture() { Shaders::Phong shader(Shaders::Phong::Flag::AmbientTexture|Shaders::Phong::Flag::SpecularTexture); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -116,7 +116,7 @@ void PhongGLTest::compileDiffuseSpecularTexture() { Shaders::Phong shader(Shaders::Phong::Flag::DiffuseTexture|Shaders::Phong::Flag::SpecularTexture); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -126,7 +126,7 @@ void PhongGLTest::compileAmbientDiffuseSpecularTexture() { Shaders::Phong shader(Shaders::Phong::Flag::AmbientTexture|Shaders::Phong::Flag::DiffuseTexture|Shaders::Phong::Flag::SpecularTexture); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } diff --git a/src/Magnum/Shaders/Test/VectorGLTest.cpp b/src/Magnum/Shaders/Test/VectorGLTest.cpp index fc0f6048e..4a2e57678 100644 --- a/src/Magnum/Shaders/Test/VectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VectorGLTest.cpp @@ -44,7 +44,7 @@ void VectorGLTest::compile2D() { Shaders::Vector2D shader; { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -54,7 +54,7 @@ void VectorGLTest::compile3D() { Shaders::Vector3D shader; { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } diff --git a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp index f0486888d..13e5bf000 100644 --- a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp @@ -44,7 +44,7 @@ void VertexColorGLTest::compile2D() { Shaders::VertexColor2D shader; { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } @@ -54,7 +54,7 @@ void VertexColorGLTest::compile3D() { Shaders::VertexColor3D shader; { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(shader.validate().first); } diff --git a/src/Magnum/Test/AbstractOpenGLTester.h b/src/Magnum/Test/AbstractOpenGLTester.h index f0897fee1..2164f8163 100644 --- a/src/Magnum/Test/AbstractOpenGLTester.h +++ b/src/Magnum/Test/AbstractOpenGLTester.h @@ -53,7 +53,7 @@ class AbstractOpenGLTester: public TestSuite::Tester { AbstractOpenGLTester::AbstractOpenGLTester(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, _windowlessApplication{{arguments().first, arguments().second}} { /* Try to create debug context, fallback to normal one if not possible. No - such thing on OSX or iOS. */ + such thing on macOS or iOS. */ #ifndef CORRADE_TARGET_APPLE if(!_windowlessApplication.tryCreateContext(Platform::WindowlessApplication::Configuration{}.setFlags(Platform::WindowlessApplication::Configuration::Flag::Debug))) _windowlessApplication.createContext(); diff --git a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp index d00514c57..68cecb16c 100644 --- a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp @@ -229,7 +229,7 @@ void AbstractShaderProgramGLTest::create() { CORRADE_VERIFY(linked); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(valid); } @@ -289,7 +289,7 @@ void AbstractShaderProgramGLTest::createMultipleOutputs() { CORRADE_VERIFY(linked); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(valid); } @@ -343,7 +343,7 @@ void AbstractShaderProgramGLTest::createMultipleOutputsIndexed() { CORRADE_VERIFY(linked); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(valid); } @@ -543,7 +543,7 @@ void AbstractShaderProgramGLTest::createUniformBlocks() { CORRADE_VERIFY(linked); { #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL("OSX drivers need insane amount of state to validate properly."); + CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly."); #endif CORRADE_VERIFY(valid); }