From dde456cbc80c2db68f13f49511070c3766f87cf2 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Fri, 14 Jan 2022 18:23:51 +0100
Subject: [PATCH] Removed the unnecessary Renderer::getWindowFlags() function.
---
es-core/src/renderers/Renderer.cpp | 12 ++++++------
es-core/src/renderers/Renderer.h | 2 --
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/es-core/src/renderers/Renderer.cpp b/es-core/src/renderers/Renderer.cpp
index e54a55489..8f6e86e8c 100644
--- a/es-core/src/renderers/Renderer.cpp
+++ b/es-core/src/renderers/Renderer.cpp
@@ -172,10 +172,10 @@ namespace Renderer
// The borderless mode seems to behave well and it's almost completely seamless, especially
// with a hidden taskbar.
if (!userResolution)
- windowFlags = SDL_WINDOW_BORDERLESS | getWindowFlags();
+ windowFlags = SDL_WINDOW_BORDERLESS | SDL_WINDOW_OPENGL;
else
// If the resolution has been manually set from the command line, then keep the border.
- windowFlags = getWindowFlags();
+ windowFlags = SDL_WINDOW_OPENGL;
#elif defined(__APPLE__)
// Not sure if this could be a useful setting.
// SDL_SetHint(SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES, "0");
@@ -188,14 +188,14 @@ namespace Renderer
// configured to run in fullscreen mode or switching to its window will not work, but
// apart from that this mode works fine.
if (!userResolution)
- windowFlags = SDL_WINDOW_BORDERLESS | SDL_WINDOW_ALLOW_HIGHDPI | getWindowFlags();
+ windowFlags = SDL_WINDOW_BORDERLESS | SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_OPENGL;
else
- windowFlags = SDL_WINDOW_ALLOW_HIGHDPI | getWindowFlags();
+ windowFlags = SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_OPENGL;
#else
if (!userResolution)
- windowFlags = SDL_WINDOW_FULLSCREEN_DESKTOP | getWindowFlags();
+ windowFlags = SDL_WINDOW_FULLSCREEN_DESKTOP | SDL_WINDOW_OPENGL;
else
- windowFlags = getWindowFlags();
+ windowFlags = SDL_WINDOW_OPENGL;
#endif
if ((sdlWindow =
diff --git a/es-core/src/renderers/Renderer.h b/es-core/src/renderers/Renderer.h
index ff4b61c53..132bca202 100644
--- a/es-core/src/renderers/Renderer.h
+++ b/es-core/src/renderers/Renderer.h
@@ -166,8 +166,6 @@ namespace Renderer
const Renderer::shaderParameters& parameters = shaderParameters(),
unsigned char* textureRGBA = nullptr);
- static inline unsigned int getWindowFlags() { return SDL_WINDOW_OPENGL; }
-
void setupWindow();
bool createContext();
void destroyContext();