Changeset 651 for trunk/src/plugins/gfxdrivers

Timestamp:

Mar 8, 2010, 12:52:58 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/ahi/qscreenahi_qws.h (modified) (1 diff)
• src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h (modified) (1 diff)
• src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/directfb/qdirectfbmouse.h (modified) (1 diff)
• src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h (modified) (1 diff)
• src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp (modified) (10 diffs)
• src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h (modified) (1 diff)
• src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp (modified) (4 diffs)
• src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h (modified) (2 diffs)
• src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/directfb/qdirectfbscreen.h (modified) (2 diffs)
• src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp (modified) (2 diffs)
• src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h (modified) (1 diff)
• src/plugins/gfxdrivers/linuxfb/main.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c (modified) (1 diff)
• src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h (modified) (1 diff)
• src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h (modified) (1 diff)
• src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c (modified) (1 diff)
• src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h (modified) (1 diff)
• src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h (modified) (1 diff)
• src/plugins/gfxdrivers/qvfb/main.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/transformed/main.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/vnc/main.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/vnc/qscreenvnc_p.h (modified) (1 diff)
• src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h (modified) (1 diff)

trunk/src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/ahi/qscreenahi_qws.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -104 +104 @@
     void blit(const QRectF &dest, IDirectFBSurface *surface, const QRectF &src);
 
+
+
     inline void updateClip();
     virtual void systemStateChanged();
@@ -527 +529 @@
     if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
         || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-        || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
+        || (d->clipType == QDirectFBPaintEnginePrivate::ComplexClip)
+        || (!d->supportsStretchBlit() && state()->matrix.mapRect(r).size() != sr.size())
 #ifndef QT_DIRECTFB_IMAGECACHE
-        || QDirectFBScreen::getSurfacePixelFormat(image.format()) == DSPF_UNKNOWN
+        || 
 #elif defined QT_NO_DIRECTFB_PREALLOCATED
-        || QDirectFBPaintEnginePrivate::cacheCost(image) > imageCache.maxCost()
+        || )
 #endif
         )
@@ -574 +577 @@
         QDirectFBPixmapData *dfbData = static_cast<QDirectFBPixmapData*>(data);
         if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
-               || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-               || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
-               || (state()->renderHints & QPainter::SmoothPixmapTransform
-                   && state()->matrix.mapRect(r).size() != sr.size())) {
+            || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
+            || (d->clipType == QDirectFBPaintEnginePrivate::ComplexClip)
+            || (!d->supportsStretchBlit() && state()->matrix.mapRect(r).size() != sr.size())) {
             RASTERFALLBACK(DRAW_PIXMAP, r, pixmap.size(), sr);
             const QImage *img = dfbData->buffer();
@@ -607 +609 @@
     } else if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
                || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-               || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
-               || (state()->renderHints & QPainter::SmoothPixmapTransform && state()->matrix.isScaling())) {
+               || 
+               || ( && state()->matrix.isScaling())) {
         RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), offset);
         QPixmapData *pixmapData = pixmap.pixmapData();
@@ -733 +735 @@
             if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
                 || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-                || (state()->renderHints & QPainter::SmoothPixmapTransform && state()->matrix.isScaling())) {
+                || ( && state()->matrix.isScaling())) {
                 break;
             }
@@ -758 +760 @@
     Q_D(QDirectFBPaintEngine);
     if ((d->transformationType & QDirectFBPaintEnginePrivate::Matrix_RectsUnsupported)
-        || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
+        || 
         || !d->testCompositionMode(0, 0, &color)) {
         RASTERFALLBACK(FILL_RECT, rect, color, VOID_ARG());
@@ -1050 +1052 @@
         result = surface->Blit(surface, s, &sRect, dr.x(), dr.y());
     } else {
+
         const DFBRectangle dRect = { dr.x(), dr.y(), dr.width(), dr.height() };
         result = surface->StretchBlit(surface, s, &sRect, &dRect);
@@ -1097 +1100 @@
     IDirectFBSurface *sourceSurface = dfbData->directFBSurface();
     if (transform.isScaling()) {
+
         Q_ASSERT(qMin(transform.m11(), transform.m22()) >= 0);
         offset.rx() *= transform.m11();
@@ -1185 +1189 @@
 }
 
+
+
+
+
+
+
+
+
+
+
 void QDirectFBPaintEnginePrivate::systemStateChanged()
 {

trunk/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -471 +471 @@
 
     QDirectFBPixmapData *data = new QDirectFBPixmapData(screen, QPixmapData::PixmapType);
+
     DFBSurfaceBlittingFlags flags = DSBLIT_NOFX;
     data->alpha = alpha;
@@ -552 +553 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void QDirectFBPixmapData::invalidate()
 {
@@ -568 +597 @@
 
 #endif // QT_NO_QWS_DIRECTFB
-
-
-

trunk/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -82 +82 @@
     virtual QPaintEngine *paintEngine() const;
     virtual QImage *buffer();
+
     // Pure virtual in QPixmapData, so re-implement here and delegate to QDirectFBPaintDevice
     virtual int metric(QPaintDevice::PaintDeviceMetric m) const { return QDirectFBPaintDevice::metric(m); }

trunk/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -69 +69 @@
 #if !defined QT_NO_DIRECTFB_IMAGEPROVIDER && !defined QT_DIRECTFB_IMAGEPROVIDER
 #define QT_DIRECTFB_IMAGEPROVIDER
+
+
+
 #endif
 #if !defined QT_DIRECTFB_IMAGEPROVIDER_KEEPALIVE && !defined QT_NO_DIRECTFB_IMAGEPROVIDER_KEEPALIVE

trunk/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -379 +379 @@
     }
     screen->flipSurface(dfbSurface, flipFlags, region, offset);
-    if (noSystemBackground) {
-        dfbSurface->Clear(dfbSurface, 0, 0, 0, 0);
-    }
 #else
     setOpaque(windowOpacity != 0xff);

trunk/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/linuxfb/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/qvfb/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/transformed/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/vnc/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])