From 7f8227ad083ba3973e345efc7a23ee4b64059112 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 23 Jun 2014 19:10:33 +0300 Subject: Add glx functions helpers. Add some glx functions. --- src/graphicsmanager.cpp | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) (limited to 'src/graphicsmanager.cpp') diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index 241a9c438..696c0fb77 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -23,20 +23,20 @@ #ifdef USE_OPENGL #ifndef WIN32 + #ifdef ANDROID #include #include #include #ifndef USE_SDL2 #include -#endif -#else +#endif // USE_SDL2 +#else // ANDROID #include +#endif // ANDROID +#else // WIN32 #endif -#else -#endif - -#endif +#endif // USE_OPENGL #include "configuration.h" #include "logger.h" @@ -56,6 +56,8 @@ #include "resources/openglimagehelper.h" #include "resources/sdlimagehelper.h" +#include "render/mglfunctions.h" + #ifdef USE_SDL2 #include "render/sdl2softwaregraphics.h" @@ -77,25 +79,6 @@ #ifndef GL_MAX_RENDERBUFFER_SIZE #define GL_MAX_RENDERBUFFER_SIZE 0x84E8 #endif - -#ifdef WIN32 -#define getFunction(name) wglGetProcAddress(name) -#elif defined ANDROID -#define getFunction(name) eglGetProcAddress(name) -#elif defined __APPLE__ -#define getFunction(name) nullptr -#else -#define getFunction(name) glXGetProcAddress(\ - reinterpret_cast(name)) -#endif - -#define assignFunction(func, name) m##func \ - = reinterpret_cast(getFunction(name)); \ - if (m##func == nullptr) \ - logger->log(std::string("function not found: ") + name); \ - else \ - logger->log(std::string("assigned function: ") + name); - #endif GraphicsManager graphicsManager; -- cgit v1.2.3-70-g09d2