diff options
author | Michael Lutz <michi@icosahedron.de> | 2021-04-21 22:06:04 +0200 |
---|---|---|
committer | Michael Lutz <michi@icosahedron.de> | 2021-04-21 22:44:59 +0200 |
commit | e53313391a77eacc23b9aac4a68b4ed0471e0271 (patch) | |
tree | e2406924f277ee1d257fa7a57f9a2e84ae8aa855 /src/video/opengl.cpp | |
parent | 5ff15443e9160d2669ee9f54a3cefd0c43537320 (diff) | |
download | openttd-e53313391a77eacc23b9aac4a68b4ed0471e0271.tar.xz |
Fix: [OpenGL] Check maximum supported texture size against screen resolution.
Diffstat (limited to 'src/video/opengl.cpp')
-rw-r--r-- | src/video/opengl.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/video/opengl.cpp b/src/video/opengl.cpp index bb509bcd7..8a4ce3451 100644 --- a/src/video/opengl.cpp +++ b/src/video/opengl.cpp @@ -464,16 +464,17 @@ void SetupDebugOutput() /** * Create and initialize the singleton back-end class. * @param get_proc Callback to get an OpenGL function from the OS driver. + * @param screen_res Current display resolution. * @return nullptr on success, error message otherwise. */ -/* static */ const char *OpenGLBackend::Create(GetOGLProcAddressProc get_proc) +/* static */ const char *OpenGLBackend::Create(GetOGLProcAddressProc get_proc, const Dimension &screen_res) { if (OpenGLBackend::instance != nullptr) OpenGLBackend::Destroy(); GetOGLProcAddress = get_proc; OpenGLBackend::instance = new OpenGLBackend(); - return OpenGLBackend::instance->Init(); + return OpenGLBackend::instance->Init(screen_res); } /** @@ -521,9 +522,10 @@ OpenGLBackend::~OpenGLBackend() /** * Check for the needed OpenGL functionality and allocate all resources. + * @param screen_res Current display resolution. * @return Error string or nullptr if successful. */ -const char *OpenGLBackend::Init() +const char *OpenGLBackend::Init(const Dimension &screen_res) { if (!BindBasicInfoProcs()) return "OpenGL not supported"; @@ -581,6 +583,11 @@ const char *OpenGLBackend::Init() } if (this->persistent_mapping_supported) DEBUG(driver, 3, "OpenGL: Using persistent buffer mapping"); + /* Check maximum texture size against screen resolution. */ + GLint max_tex_size = 0; + _glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_tex_size); + if (std::max(screen_res.width, screen_res.height) > (uint)max_tex_size) return "Max supported texture size is too small"; + /* Check available texture units. */ GLint max_tex_units = 0; _glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &max_tex_units); |