From 17555ab77041d5b68972eab608fe98799e0789e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond.kjernasen@nokia.com>
Date: Fri, 21 May 2010 13:24:54 +0200
Subject: Call eglTerminate() when the last QEglContext is destroyed to free
 mem.

We never called eglTerminate() to free memory allocated by
eglInitialize() since it was a fixed allocation that would be used
for the lifetime of an application. The new behavior is to call
eglTerminate() when the last EGL context in the app is destroyed.

Task-number: QT-3383
Reviewed-by: Rhys Weatherley
---
 src/gui/egl/qegl.cpp | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index ee19216..c16aeb1 100644
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -42,11 +42,40 @@
 #include <QtGui/qpaintdevice.h>
 #include <QtGui/qpixmap.h>
 #include <QtGui/qwidget.h>
+#include <QtCore/qatomic.h>
 #include <QtCore/qdebug.h>
 #include "qegl_p.h"
 
 QT_BEGIN_NAMESPACE
 
+
+/*
+    QEglContextTracker is used to track the EGL contexts that we
+    create internally in Qt, so that we can call eglTerminate() to
+    free additional EGL resources when the last context is destroyed.
+*/
+
+class QEglContextTracker
+{
+public:
+    static void ref() { contexts.ref(); }
+    static void deref() {
+        if (!contexts.deref()) {
+            eglTerminate(QEglContext::display());
+            displayOpen = 0;
+        }
+    }
+    static void setDisplayOpened() { displayOpen = 1; }
+    static bool displayOpened() { return displayOpen; }
+
+private:
+    static QAtomicInt contexts;
+    static QAtomicInt displayOpen;
+};
+
+QAtomicInt QEglContextTracker::contexts = 0;
+QAtomicInt QEglContextTracker::displayOpen = 0;
+
 // Current GL and VG contexts.  These are used to determine if
 // we can avoid an eglMakeCurrent() after a call to lazyDoneCurrent().
 // If a background thread modifies the value, the worst that will
@@ -65,6 +94,7 @@ QEglContext::QEglContext()
     , ownsContext(true)
     , sharing(false)
 {
+    QEglContextTracker::ref();
 }
 
 QEglContext::~QEglContext()
@@ -75,6 +105,7 @@ QEglContext::~QEglContext()
         currentGLContext = 0;
     if (currentVGContext == this)
         currentVGContext = 0;
+    QEglContextTracker::deref();
 }
 
 bool QEglContext::isValid() const
@@ -361,11 +392,9 @@ QEglProperties QEglContext::configProperties(EGLConfig cfg) const
 
 EGLDisplay QEglContext::display()
 {
-    static bool openedDisplay = false;
-
-    if (!openedDisplay) {
+    if (!QEglContextTracker::displayOpened()) {
         dpy = eglGetDisplay(nativeDisplay());
-        openedDisplay = true;
+        QEglContextTracker::setDisplayOpened();
         if (dpy == EGL_NO_DISPLAY) {
             qWarning("QEglContext::display(): Falling back to EGL_DEFAULT_DISPLAY");
             dpy = eglGetDisplay(EGLNativeDisplayType(EGL_DEFAULT_DISPLAY));
-- 
cgit v0.12