diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-07-17 19:27:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-07-17 20:30:23 +0300 |
| commit | d1b6556bd125f52744ff12b8dd2e644a1515205f (patch) | |
| tree | 6beaf0721bb5293643f3f2fdc1d2ed4287b12b5f /src/render | |
| parent | 4ecdb004e81a459ea63ebd7127e1c945df43f9ce (diff) | |
| download | manaplus-d1b6556bd125f52744ff12b8dd2e644a1515205f.tar.gz manaplus-d1b6556bd125f52744ff12b8dd2e644a1515205f.tar.bz2 manaplus-d1b6556bd125f52744ff12b8dd2e644a1515205f.tar.xz manaplus-d1b6556bd125f52744ff12b8dd2e644a1515205f.zip | |
Do actual SDL2 graphics cleanup before exit.
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/graphics.cpp | 22 | ||||
| -rw-r--r-- | src/render/graphics.h | 8 |
2 files changed, 21 insertions, 9 deletions
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp index 92a9acc36..82a4cbfd6 100644 --- a/src/render/graphics.cpp +++ b/src/render/graphics.cpp @@ -107,6 +107,18 @@ RENDER_OPENGL_MGLDEFINES_H Graphics *mainGraphics A_NONNULLPOINTER = nullptr; +#ifdef USE_SDL2 +SDL_Renderer *restrict Graphics::mRenderer = nullptr; +#endif // USE_SDL2 +#ifdef USE_OPENGL +#ifdef USE_SDL2 +SDL_GLContext Graphics::mGLContext = nullptr; +#else // USE_SDL2 + +void *restrict Graphics::mGLContext = nullptr; +#endif // USE_SDL2 +#endif // USE_OPENGL + Graphics::Graphics() : mWidth(0), mHeight(0), @@ -114,12 +126,6 @@ Graphics::Graphics() : mActualHeight(0), mClipStack(1000), mWindow(nullptr), -#ifdef USE_SDL2 - mRenderer(nullptr), -#endif // USE_SDL2 -#ifdef USE_OPENGL - mGLContext(nullptr), -#endif // USE_OPENGL mBpp(0), mAlpha(false), mFullscreen(false), @@ -146,6 +152,10 @@ Graphics::Graphics() : Graphics::~Graphics() { endDraw(); +} + +void Graphics::cleanUp() +{ #ifdef USE_SDL2 if (mRenderer) { diff --git a/src/render/graphics.h b/src/render/graphics.h index 36f3ed721..6eb18dfab 100644 --- a/src/render/graphics.h +++ b/src/render/graphics.h @@ -120,6 +120,8 @@ class Graphics notfinal */ virtual ~Graphics(); + static void cleanUp(); + /** * Alignments for text drawing. */ @@ -518,14 +520,14 @@ class Graphics notfinal SDL_Window *restrict mWindow; #ifdef USE_SDL2 - SDL_Renderer *restrict mRenderer; + static SDL_Renderer *restrict mRenderer; #endif // USE_SDL2 #ifdef USE_OPENGL #ifdef USE_SDL2 - SDL_GLContext mGLContext; + static SDL_GLContext mGLContext; #else // USE_SDL2 - void *restrict mGLContext; + static void *restrict mGLContext; #endif // USE_SDL2 #endif // USE_OPENGL |