From f4e16cdddb9aee5ab8086eb9531219cdb82b35b9 Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Thu, 31 Jul 2014 08:21:23 +0200 Subject: [PATCH] Implemented desktop_size discovery in GLRenderer --- src/video/gl/gl_renderer.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/video/gl/gl_renderer.cpp b/src/video/gl/gl_renderer.cpp index d8697856f..950ee4074 100644 --- a/src/video/gl/gl_renderer.cpp +++ b/src/video/gl/gl_renderer.cpp @@ -42,20 +42,9 @@ GLRenderer::GLRenderer() : { Renderer::instance_ = this; -#if SDL_MAJOR_VERSION > 1 || SDL_MINOR_VERSION > 2 || (SDL_MINOR_VERSION == 2 && SDL_PATCHLEVEL >= 10) - // unfortunately only newer SDLs have these infos. - // This must be called before SDL_SetVideoMode() or it will return - // the window size instead of the desktop size. -#ifdef OLD_SDL1 - const SDL_VideoInfo *info = SDL_GetVideoInfo(); - if (info) - { - desktop_size = Size(info->current_w, info->current_h); - } -#else - desktop_size = Size(1920, 1080); -#endif -#endif + SDL_DisplayMode mode; + SDL_GetCurrentDisplayMode(0, &mode); + desktop_size = Size(mode.w, mode.h); if(texture_manager != 0) texture_manager->save_textures(); -- 2.11.0