1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Free the GLX framebuffer configurations

Browse Source 
Adds missing XFree for a glXChooseFBConfig

Change-Id: I4c30341f90666170dac5d90b0c65d1deff4e0818
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit da898fca026f629be0ed234f0a89a99bc662385d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Inho Lee 2023-01-25 07:49:29 +01:00 committed by Qt Cherry-pick Bot
parent 600a5c2035
commit 23c49af8a3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
View File

@ -395,14 +395,19 @@ QGLXContext::QGLXContext(Display *display, GLXContext context, void *visualInfo,
int numConfigs = 0; int numConfigs = 0;
static const int attribs[] = { GLX_FBCONFIG_ID, configId, None }; static const int attribs[] = { GLX_FBCONFIG_ID, configId, None };
configs = glXChooseFBConfig(m_display, screenNumber, attribs, &numConfigs); configs = glXChooseFBConfig(m_display, screenNumber, attribs, &numConfigs);
if (!configs || numConfigs < 1) { if (!configs) {
qWarning("QGLXContext: Failed to find config(invalid arguments for glXChooseFBConfig)");
return;
} else if (numConfigs < 1) {
qWarning("QGLXContext: Failed to find config"); qWarning("QGLXContext: Failed to find config");
XFree(configs);
return; return;
} }
if (configs && numConfigs > 1) // this is suspicious so warn but let it continue if (configs && numConfigs > 1) // this is suspicious so warn but let it continue
qWarning("QGLXContext: Multiple configs for FBConfig ID %d", configId); qWarning("QGLXContext: Multiple configs for FBConfig ID %d", configId);
m_config = configs[0]; m_config = configs[0];
XFree(configs);
} }
Q_ASSERT(vinfo || m_config); Q_ASSERT(vinfo || m_config);