From 4ecf819fe58c519b79601cbef05cd3877ba9205d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 1 Jun 2018 01:44:14 +0200 Subject: [PATCH] Platform: avoid using deprecated APIs in WindowlessIosApplication. Fallen through cracks. Sorry. --- src/Magnum/Platform/WindowlessIosApplication.h | 4 ++-- src/Magnum/Platform/WindowlessIosApplication.mm | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Magnum/Platform/WindowlessIosApplication.h b/src/Magnum/Platform/WindowlessIosApplication.h index 01f2df673..749ac877c 100644 --- a/src/Magnum/Platform/WindowlessIosApplication.h +++ b/src/Magnum/Platform/WindowlessIosApplication.h @@ -33,8 +33,8 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/OpenGL.h" #include "Magnum/Tags.h" +#include "Magnum/GL/OpenGL.h" #include "Magnum/Platform/Platform.h" #ifdef __OBJC__ @@ -72,7 +72,7 @@ class WindowlessIosContext { * be able to use Magnum. * @see @ref isCreated() */ - explicit WindowlessIosContext(const Configuration& configuration, Context* context = nullptr); + explicit WindowlessIosContext(const Configuration& configuration, GLContext* context = nullptr); /** * @brief Construct without creating the context diff --git a/src/Magnum/Platform/WindowlessIosApplication.mm b/src/Magnum/Platform/WindowlessIosApplication.mm index 6fb78199c..a1ff3b441 100644 --- a/src/Magnum/Platform/WindowlessIosApplication.mm +++ b/src/Magnum/Platform/WindowlessIosApplication.mm @@ -28,8 +28,8 @@ #include #include -#include "Magnum/Version.h" -#include "Magnum/Platform/Context.h" +#include "Magnum/GL/Version.h" +#include "Magnum/Platform/GLContext.h" #import "EAGL.h" @@ -39,7 +39,7 @@ namespace Magnum { namespace Platform { -WindowlessIosContext::WindowlessIosContext(const Configuration&, Context*) { +WindowlessIosContext::WindowlessIosContext(const Configuration&, GLContext*) { if(!(_context = [[EAGLContext alloc] #ifdef MAGNUM_TARGET_GLES2 initWithAPI:kEAGLRenderingAPIOpenGLES2 @@ -82,7 +82,7 @@ WindowlessIosApplication::WindowlessIosApplication(const Arguments& arguments, c createContext(configuration); } -WindowlessIosApplication::WindowlessIosApplication(const Arguments& arguments, NoCreateT): _glContext{NoCreate}, _context{new Context{NoCreate, arguments.argc, arguments.argv}} {} +WindowlessIosApplication::WindowlessIosApplication(const Arguments& arguments, NoCreateT): _glContext{NoCreate}, _context{new GLContext{NoCreate, arguments.argc, arguments.argv}} {} void WindowlessIosApplication::createContext() { createContext({}); } @@ -91,7 +91,7 @@ void WindowlessIosApplication::createContext(const Configuration& configuration) } bool WindowlessIosApplication::tryCreateContext(const Configuration& configuration) { - CORRADE_ASSERT(_context->version() == Version::None, "Platform::WindowlessIosApplication::tryCreateContext(): context already created", false); + CORRADE_ASSERT(_context->version() == GL::Version::None, "Platform::WindowlessIosApplication::tryCreateContext(): context already created", false); WindowlessIosContext glContext{configuration, _context.get()}; if(!glContext.isCreated() || !glContext.makeCurrent() || !_context->tryCreate())