ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix memory leak in Gallium EGL driver 

With this patch, the reference count of the textures created in
'Surface::_validate()' gets decreased in the '~Surface()' destructor.

Fixes #1012.
This commit is contained in:
Christian Prochaska 2014-01-02 19:38:14 +01:00 committed by Christian Helmuth
parent cca2dbc400
commit 5df654ace4
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libports/src/lib/egl/driver.cc
View File

@ -411,6 +411,13 @@ class Surface : public native_surface
wait = _wait;
}
~Surface()
{
for (int i = 0; i < NUM_NATIVE_ATTACHMENTS; i++)
if (_textures[i])
pipe_texture_reference(&_textures[i], 0);
}
/**
* Return texture used as backing store for the surface
*/

24
libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp
View File

@ -81,13 +81,6 @@ bool QNitpickerGLContext::makeCurrent(QPlatformSurface *surface)
if (qnglc_verbose)
PDBG("w->framebuffer() = %p", w->framebuffer());
#if 0
/*
* Unfortunalety, this code triggers a memory leak somewhere,
* so it cannot be used yet.
*/
if (w->egl_surface() != EGL_NO_SURFACE)
if (!eglDestroySurface(_egl_display, w->egl_surface()))
qFatal("eglDestroySurface() failed");
@ -100,23 +93,6 @@ bool QNitpickerGLContext::makeCurrent(QPlatformSurface *surface)
w->egl_surface(egl_surface);
#else
/* temporary workaround, the surface gets created only once */
if (w->egl_surface() == EGL_NO_SURFACE) {
EGLSurface egl_surface =
eglCreateWindowSurface(_egl_display, _egl_config, &egl_window, 0);
if (egl_surface == EGL_NO_SURFACE)
qFatal("eglCreateiWindowSurface() failed");
w->egl_surface(egl_surface);
}
#endif
if (!eglMakeCurrent(_egl_display, w->egl_surface(), w->egl_surface(), _egl_context))
qFatal("eglMakeCurrent() failed");