Merge remote-tracking branch 'qt/4.8'

2 files changed, 96 insertions, 16 deletions

diff --git a/src/gui/painting/qgraphicssystemex_symbian.cpp b/src/gui/painting/qgraphicssystemex_symbian.cpp
index 4469704..32e040f 100644
--- a/src/gui/painting/qgraphicssystemex_symbian.cpp
+++ b/src/gui/painting/qgraphicssystemex_symbian.cpp
@@ -46,31 +46,108 @@
 
 #include <e32property.h>
 
+#ifdef Q_SYMBIAN_SUPPORTS_SURFACES
+#include "private/qegl_p.h"
+#endif
+
 QT_BEGIN_NAMESPACE
 
 static bool bcm2727Initialized = false;
 static bool bcm2727 = false;
 
+#ifdef Q_SYMBIAN_SUPPORTS_SURFACES
+typedef EGLBoolean (*NOK_resource_profiling)(EGLDisplay, EGLint, EGLint*, EGLint, EGLint*);
+#define EGL_PROF_TOTAL_MEMORY_NOK 0x3070
+#endif
+
+// Detect if Qt is running on BCM2727 chip.
+// BCM2727 is a special case on Symbian because
+// it has only 32MB GPU memory which exposes
+// significant limitations to hw accelerated UI.
 bool QSymbianGraphicsSystemEx::hasBCM2727()
 {
     if (bcm2727Initialized)
         return bcm2727;
 
-    const TUid KIvePropertyCat = {0x2726beef};
-    enum TIvePropertyChipType {
-        EVCBCM2727B1 = 0x00000000,
-        EVCBCM2763A0 = 0x04000100,
-        EVCBCM2763B0 = 0x04000102,
-        EVCBCM2763C0 = 0x04000103,
-        EVCBCM2763C1 = 0x04000104,
-        EVCBCMUnknown = 0x7fffffff
-    };
-
-    TInt chipType = EVCBCMUnknown;
-    if (RProperty::Get(KIvePropertyCat, 0, chipType) == KErrNone) {
-        if (chipType == EVCBCM2727B1)
+#ifdef Q_SYMBIAN_SUPPORTS_SURFACES
+    EGLDisplay display = QEgl::display();
+#if 1
+    // Hacky but fast ~0ms.
+    const char* vendor = eglQueryString(display, EGL_VENDOR);
+    if (strstr(vendor, "Broadcom")) {
+        const TUid KIvePropertyCat = {0x2726beef};
+        enum TIvePropertyChipType {
+            EVCBCM2727B1 = 0x00000000,
+            EVCBCM2763A0 = 0x04000100,
+            EVCBCM2763B0 = 0x04000102,
+            EVCBCM2763C0 = 0x04000103,
+            EVCBCM2763C1 = 0x04000104,
+            EVCBCMUnknown = 0x7fffffff
+        };
+
+        // Broadcom driver publishes KIvePropertyCat PS key on
+        // devices which are running on BCM2727 chip and post Anna Symbian.
+        TInt chipType = EVCBCMUnknown;
+        if (RProperty::Get(KIvePropertyCat, 0, chipType) == KErrNone) {
+            if (chipType == EVCBCM2727B1)
+                bcm2727 = true;
+        } else if (QSysInfo::symbianVersion() <= QSysInfo::SV_SF_3) {
+            // Device is running on Symbian Anna or older Symbian^3 in which
+            // KIvePropertyCat is not published. These ones are always 32MB devices.
+            bcm2727 = true;
+        } else {
+            // We have some other Broadcom chip on post Anna Symbian.
+            // Should have > 32MB GPU memory.
+        }
+    }
+#else
+    // Fool proof but takes 15-20ms and we don't want this delay on app startup...
+
+    // All devices with <= 32MB GPU memory should be
+    // dealed in similar manner to BCM2727
+    // So let's query max GPU memory amount.
+    NOK_resource_profiling eglQueryProfilingData = (NOK_resource_profiling)eglGetProcAddress("eglQueryProfilingDataNOK");
+    if (eglQueryProfilingData) {
+        EGLint dataCount;
+        eglQueryProfilingData(display,
+                               EGL_PROF_QUERY_GLOBAL_BIT_NOK |
+                               EGL_PROF_QUERY_MEMORY_USAGE_BIT_NOK,
+                               NULL,
+                               0,
+                               (EGLint*)&dataCount);
+
+        // Allocate room for the profiling data
+        EGLint* profData = (EGLint*)malloc(dataCount * sizeof(EGLint));
+        memset(profData,0,dataCount * sizeof(EGLint));
+
+        // Retrieve the profiling data
+        eglQueryProfilingData(display,
+                              EGL_PROF_QUERY_GLOBAL_BIT_NOK |
+                              EGL_PROF_QUERY_MEMORY_USAGE_BIT_NOK,
+                              profData,
+                              dataCount,
+                              (EGLint*)&dataCount);
+
+        int totalMemory;
+        EGLint i = 0;
+        while (profData && i < dataCount) {
+            switch (profData[i++]) {
+                case EGL_PROF_TOTAL_MEMORY_NOK:
+                    totalMemory = profData[i++];
+                    break;
+                default:
+                    i++;
+            }
+        }
+
+        // ok, hasBCM2727() naming is a bit misleading but Qt must
+        // behave the same on all chips like BCM2727 (<= 32MB GPU memory)
+        // and our code (and others) are already using this function.
+        if (totalMemory <= 33554432)
             bcm2727 = true;
     }
+#endif
+#endif // Q_SYMBIAN_SUPPORTS_SURFACES
 
     bcm2727Initialized = true;
 
@@ -80,7 +157,9 @@ bool QSymbianGraphicsSystemEx::hasBCM2727()
 void QSymbianGraphicsSystemEx::releaseCachedGpuResources()
 {
     // Do nothing here
-    // This is implemented in graphics system specific plugin
+
+    // This virtual function should be implemented in graphics system specific
+    // plugin
 }
 
 void QSymbianGraphicsSystemEx::releaseAllGpuResources()
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index 15ff044..2a25bff 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -254,8 +254,9 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
     } else
 #endif
     {
+        int depth = widget->x11Info().depth();
         const QImage &src = d->image->image;
-        if (src.format() != QImage::Format_RGB32 || widget->x11Info().depth() < 24) {
+        if (src.format() != QImage::Format_RGB32 || depth < 24 || X11->bppForDepth.value(depth) != 32) {
             Q_ASSERT(src.depth() >= 16);
             const QImage sub_src(src.scanLine(br.y()) + br.x() * (uint(src.depth()) / 8),
                                  br.width(), br.height(), src.bytesPerLine(), src.format());
@@ -267,7 +268,7 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
         } else {
             // qpaintengine_x11.cpp
             extern void qt_x11_drawImage(const QRect &rect, const QPoint &pos, const QImage &image, Drawable hd, GC gc, Display *dpy, Visual *visual, int depth);
-            qt_x11_drawImage(br, wpos, src, widget->handle(), d_ptr->gc, X11->display, (Visual *)widget->x11Info().visual(), widget->x11Info().depth());
+            qt_x11_drawImage(br, wpos, src, widget->handle(), d_ptr->gc, X11->display, (Visual *)widget->x11Info().visual(), depth);
         }
     }