Changeset 308 for trunk/src

Timestamp:

Nov 10, 2009, 1:49:03 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Use manual image flipping (from Qt to PM) instead of setting the world transformation matrix. Added a simple pixel/ms counter for measurements.

Location:

trunk/src/gui

Files:

• kernel/qapplication_pm.cpp (modified) (1 diff)
• painting/qwindowsurface_raster.cpp (modified) (3 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -390 +390 @@
         displayPS = 0;
     }
+
+#ifdef QT_LOG_BLITSPEED
+    extern unsigned long long qt_total_blit_ms;
+    extern unsigned long long qt_total_blit_pixels;
+    printf("*** qt_total_blit_ms %llu\n"
+           "*** qt_total_blit_pixels %llu\n"
+           "*** speed %llu pixels/ms",
+           qt_total_blit_ms, qt_total_blit_pixels,
+           qt_total_blit_pixels / qt_total_blit_ms);
+#endif
 }
 

trunk/src/gui/painting/qwindowsurface_raster.cpp

@@ -66 +66 @@
 #endif
 
+#if defined(Q_WS_PM) && defined(QT_LOG_BLITSPEED)
+#include <InnotekLIBC/FastInfoBlocks.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 #ifdef Q_WS_WIN
 PtrUpdateLayeredWindowIndirect ptrUpdateLayeredWindowIndirect;
+#endif
+
+#if defined(Q_WS_PM) && defined(QT_LOG_BLITSPEED)
+unsigned long long qt_total_blit_ms = 0;
+unsigned long long qt_total_blit_pixels = 0;
 #endif
 
@@ -203 +212 @@
 #ifdef Q_WS_PM
     QRect br = rgn.boundingRect();
+
+    HPS wps = widget->getPS();
+
 #if 0
-    qDebug("QRasterWindowSurface::flush: [%s] br=%d,%d/%d,%d",
+    qDebug("QRasterWindowSurface::flush: [%s] wps %x br %d,%d/%d,%d",
+           qWidgetName(widget).toUtf8().constData(), (unsigned int)wps,
+           br.x(), br.y(), br.width(), br.height());
+#endif
+
+#ifdef QT_LOG_BLITSPEED
+    unsigned long ticks = fibGetMsCount();
+#endif
+
+#if 1
+    // flip the image vertically for PM
+    QImage img = d->image->image.mirrored();
+
+    QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
+    QRect wbr = br.translated(-wOffset);
+
+    br.translate(offset);
+
+    BITMAPINFOHEADER2 bmh;
+    memset(&bmh, 0, sizeof(BITMAPINFOHEADER2));
+    bmh.cbFix = sizeof(BITMAPINFOHEADER2);
+    bmh.cPlanes = 1;
+    bmh.cBitCount = 32; // @todo support 8-bit indexed colors?
+    bmh.cx = img.width();
+    bmh.cy = img.height();
+
+    int wh = widget->height();
+    int ih = img.height();
+
+    // Note: target is inclusive-inclusive, source is inclusive-exclusive
+    POINTL ptls[] = { { wbr.left(), wh - wbr.bottom() - 1 },
+                      { wbr.right(), wh - wbr.top() - 1 },
+                      { br.left(), ih - br.bottom() - 1 },
+                      { br.right() + 1, ih - br.top() } };
+#if 0
+    qDebug("QRasterWindowSurface::flush: [%s] ptls %ld,%ld-%ld,%ld %ld,%ld-%ld,%ld",
            qWidgetName(widget).toUtf8().constData(),
-           br.x(), br.y(), br.width(), br.height());
-#endif
-
-    HPS wps = widget->getPS();
-
-    // use the reflection + transformation matrix to flip the y axis
+           ptls[0].x, ptls[0].y, ptls[1].x, ptls[1].y,
+           ptls[2].x, ptls[2].y, ptls[3].x, ptls[3].y);
+#endif
+    GpiDrawBits(wps, (PVOID) img.bits(), (PBITMAPINFO2) &bmh, 4, ptls,
+                ROP_SRCCOPY, BBO_IGNORE);
+#else
+    // use the reflection + transformation matrix to flip the y axis.
+    // This should be slower than flipping the image ourselves (unless this
+    // particular matrix is recognized by the driver which then enters some
+    // special mode that doesn't require any flipping at all but uses the
+    // image as is) hence disabled for now.
     // @todo check if it's really slower than flipping the image bits instead
     // @todo I guess we can use DIVE here; check it too
@@ -246 +298 @@
                 ROP_SRCCOPY, BBO_IGNORE);
 
+#ifndef QT_NO_DEBUG
+    // for debug flushing
+    const QImage img = d->image->image;
+#endif
+#endif
+
     widget->releasePS(wps);
-#endif
+
+#ifdef QT_LOG_BLITSPEED
+    ticks = fibGetMsCount() - ticks;
+    qt_total_blit_ms += ticks;
+    qt_total_blit_pixels += br.width() * br.height();
+#endif
+
+#ifndef QT_NO_DEBUG
+    static bool flush = !qgetenv("QT_FLUSH_WINDOWSURFACE").isEmpty();
+    if (flush) {
+        HPS dps = qt_display_ps();
+        RECTL rcl = { 10, 50, 10 + img.width() + 2, 50 + img.height() + 2 };
+        WinDrawBorder(dps, &rcl, 1, 1, CLR_BLACK, CLR_BLACK, 0);
+        POINTL ptls[] = { { 11, 51, },
+                          { 11 + img.width() - 1, 51 + img.height() - 1 },
+                          { 0, 0 },
+                          { img.width(), img.height() } };
+        GpiDrawBits(dps, (PVOID) img.bits(), (PBITMAPINFO2) &bmh, 4, ptls,
+                    ROP_SRCCOPY, BBO_IGNORE);
+    }
+#endif
+
+#endif // Q_WS_PM
 
 #ifdef Q_WS_X11