From 71b3a986a602e47a4d4ba433465d0cd9d1e5e168 Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Fri, 9 Oct 2009 10:54:33 +1000
Subject: Fix detection of pbuffers on OpenGL/ES systems

The previous code was searching for an exact pbuffer format of
RGBA = 1, 1, 1, 0, which of course is never going to happen.
Instead, search for the best format.

Reviewed-by: trustme

Conflicts:

	src/opengl/qglpixelbuffer_egl.cpp

Back-port of 46843022acd7322c42a98858ec52b65ce7451d06
---
 src/opengl/qglpixelbuffer_egl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/opengl/qglpixelbuffer_egl.cpp b/src/opengl/qglpixelbuffer_egl.cpp
index a501c47..b2f16c1 100644
--- a/src/opengl/qglpixelbuffer_egl.cpp
+++ b/src/opengl/qglpixelbuffer_egl.cpp
@@ -209,7 +209,7 @@ bool QGLPixelBuffer::hasOpenGLPbuffers()
     QEglProperties configProps;
     qt_egl_set_format(configProps, QInternal::Pbuffer, QGLFormat::defaultFormat());
     configProps.setRenderableType(QEglContext::OpenGL);
-    return ctx.chooseConfig(configProps);
+    return ctx.chooseConfig(configProps, QEglContext::BestPixelFormat);
 }
 
 QT_END_NAMESPACE
-- 
cgit v0.12


From 85bb10256b2745499f04c32a5ed738889606f6c3 Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Fri, 9 Oct 2009 11:02:57 +1000
Subject: Back port fixes from PowerVR driver in 4.6 to 4.5

Pre-multiply fix: 01a671ff0bd380e5cff311cc233352c867a041a0
Painting performance: c3cfba7295c990d8135e1dd70b8cdbefd25615ab
---
 .../powervr/pvreglscreen/pvreglscreen.cpp           |  2 +-
 .../powervr/pvreglscreen/pvreglwindowsurface.cpp    | 21 +++++++++++++--------
 .../powervr/pvreglscreen/pvreglwindowsurface.h      |  2 ++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp
index 25c5283..cb453d7 100644
--- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp
+++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp
@@ -104,7 +104,7 @@ bool PvrEglScreen::connect(const QString &displaySpec)
             break;
 	case PVR2D_ARGB8888:
             d = 32;
-            setPixelFormat(QImage::Format_ARGB32);
+            setPixelFormat(QImage::Format_ARGB32_Premultiplied);
             break;
         default:
             pvrQwsDisplayClose();
diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp
index afee77e..09c0ace 100644
--- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp
@@ -149,6 +149,18 @@ void PvrEglWindowSurface::setPermanentState(const QByteArray &state)
     Q_UNUSED(state);
 }
 
+void PvrEglWindowSurface::flush
+        (QWidget *widget, const QRegion &region, const QPoint &offset)
+{
+    // The GL paint engine is responsible for the swapBuffers() call.
+    // If we were to call the base class's implementation of flush()
+    // then it would fetch the image() and manually blit it to the
+    // screeen instead of using the fast PVR2D blit.
+    Q_UNUSED(widget);
+    Q_UNUSED(region);
+    Q_UNUSED(offset);
+}
+
 QImage PvrEglWindowSurface::image() const
 {
     if (drawable) {
@@ -165,14 +177,7 @@ QImage PvrEglWindowSurface::image() const
 
 QPaintDevice *PvrEglWindowSurface::paintDevice()
 {
-    QGLWidget *glWidget = qobject_cast<QGLWidget *>(window());
-    if (glWidget)
-        return glWidget;
-
-    // Should be a QGLWidget, but if not return a dummy paint device.
-    if (!pdevice)
-        pdevice = new QImage(50, 50, screen->pixelFormat());
-    return pdevice;
+    return widget;
 }
 
 void PvrEglWindowSurface::setDirectRegion(const QRegion &r, int id)
diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h
index 80fc8f8..0da3653 100644
--- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h
+++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h
@@ -65,6 +65,8 @@ public:
     QByteArray permanentState() const;
     void setPermanentState(const QByteArray &state);
 
+    void flush(QWidget *widget, const QRegion &region, const QPoint &offset);
+
     QImage image() const;
     QPaintDevice *paintDevice();
 
-- 
cgit v0.12