diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-05-13 17:53:14 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2016-08-24 13:13:20 +0000 |
| commit | e2b8c3fe8f83cf448df4b0476f4f0dd4dd7d1b80 (patch) | |
| tree | 1224f012afbdf6daf605fb6fb6f414fc769b3909 /src/core/delegated_frame_node.h | |
| parent | 8a4091c2104913294b4dc7b06c8e9fb2c022f51e (diff) | |
Fix textures memory leak on second X11 screen
Fix for QTBUG-48969 was only half-baked patch and
introduced massive memory leak on fbo and texture
alloctaions. Delete fbo and extra allocated
textures.
Task-number: QTBUG-52575
Task-number: QTBUG-48969
Change-Id: I2148f37cd27dab9e40ab72caeb6857752b69379f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/delegated_frame_node.h')
| -rw-r--r-- | src/core/delegated_frame_node.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/delegated_frame_node.h b/src/core/delegated_frame_node.h index eed03fadd..d888935b2 100644 --- a/src/core/delegated_frame_node.h +++ b/src/core/delegated_frame_node.h @@ -45,6 +45,7 @@ #include <QSharedData> #include <QSharedPointer> #include <QWaitCondition> +#include <QtGui/QOffscreenSurface> #include "chromium_gpu_helper.h" #include "render_widget_host_view_qt_delegate.h" @@ -98,6 +99,10 @@ private: QMap<uint32, gfx::TransferableFence> m_mailboxGLFences; QWaitCondition m_mailboxesFetchedWaitCond; QMutex m_mutex; +#if defined(USE_X11) + bool m_contextShared; + QScopedPointer<QOffscreenSurface> m_offsurface; +#endif }; } // namespace QtWebEngineCore |