diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp index 1de1f42c4..01f44dd76 100644 --- a/src/modules/window/sdl/Window.cpp +++ b/src/modules/window/sdl/Window.cpp @@ -95,7 +95,6 @@ Window::Window() , metalView(nullptr) #endif , displayedWindowError(false) - , hasSDL203orEarlier(false) , contextAttribs() { if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0) @@ -103,10 +102,6 @@ Window::Window() // Make sure the screensaver doesn't activate by default. setDisplaySleepEnabled(false); - - SDL_version version = {}; - SDL_GetVersion(&version); - hasSDL203orEarlier = (version.major == 2 && version.minor == 0 && version.patch <= 3); } Window::~Window() @@ -144,16 +139,6 @@ void Window::setGLFramebufferAttributes(bool sRGB) SDL_GL_SetAttribute(SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, sRGB ? 1 : 0); - const char *driver = SDL_GetCurrentVideoDriver(); - if (driver && strstr(driver, "x11") == driver) - { - // Always disable the sRGB flag when GLX is used with older SDL versions, - // because of this bug: https://bugzilla.libsdl.org/show_bug.cgi?id=2897 - // In practice GLX will always give an sRGB-capable framebuffer anyway. - if (hasSDL203orEarlier) - SDL_GL_SetAttribute(SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, 0); - } - #if defined(LOVE_WINDOWS) // Avoid the Microsoft OpenGL 1.1 software renderer on Windows. Apparently // older Intel drivers like to use it as a fallback when requesting some @@ -254,14 +239,6 @@ std::vector Window::getContextAttribsList() const if (curdriver && strstr(curdriver, glesdriver) == curdriver) { preferGLES = true; - - // Prior to SDL 2.0.4, backends that use OpenGL ES didn't properly - // ask for a sRGB framebuffer when requested by SDL_GL_SetAttribute. - // This doesn't account for windowing backends that sometimes use - // EGL, e.g. the X11 and windows SDL backends. - if (hasSDL203orEarlier) - graphics::setGammaCorrect(false); - break; } } diff --git a/src/modules/window/sdl/Window.h b/src/modules/window/sdl/Window.h index 902b19838..fac966ce4 100644 --- a/src/modules/window/sdl/Window.h +++ b/src/modules/window/sdl/Window.h @@ -175,7 +175,6 @@ private: graphics::Renderer windowRenderer = graphics::RENDERER_NONE; bool displayedWindowError; - bool hasSDL203orEarlier; ContextAttribs contextAttribs; StrongRef graphics;