Changeset 437 for trunk/src

Timestamp:

Dec 23, 2009, 1:02:06 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented new blit mirroring method using undocumented GpiEnableYInversion() (QImage.mirrored() is still the default as it seems to show better performance, see #101 for more information).

Location:

trunk/src/gui

Files:

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

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -411 +411 @@
     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",
+    printf("*** qt_total_blit_ms %llu\n"
+           "*** qt_total_blit_pixels %llu\n"
+           "*** ",
            qt_total_blit_ms, qt_total_blit_pixels,
            qt_total_blit_pixels / qt_total_blit_ms);

trunk/src/gui/painting/qwindowsurface_raster.cpp

@@ -70 +70 @@
 #endif
 
+
+
+
+
+
+
+
+
 QT_BEGIN_NAMESPACE
 
@@ -225 +233 @@
 #endif
 
-#if 1
+#if QT_BITMAP_MIRROR == 1
+
     // flip the image vertically for PM
     QImage img = d->image->image.mirrored();
@@ -258 +267 @@
     GpiDrawBits(wps, (PVOID) img.bits(), (PBITMAPINFO2) &bmh, 4, ptls,
                 ROP_SRCCOPY, BBO_IGNORE);
-#else
+
+#elif QT_BITMAP_MIRROR == 2
+
+    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 = d->image->width();
+    bmh.cy = d->image->height();
+
+    // Note: target is inclusive-inclusive, source is inclusive-exclusive
+    POINTL ptls[] = { { wbr.left(), wbr.top() },
+                      { wbr.right(), wbr.bottom() },
+                      { br.left(), br.top() },
+                      { br.right() + 1, br.bottom() + 1 } };
+#if 0
+    qDebug("QRasterWindowSurface::flush: [%s] ptls %ld,%ld-%ld,%ld %ld,%ld-%ld,%ld",
+           qWidgetName(widget).toUtf8().constData(),
+           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
+
+    // setup the Y coordinate inversion (this seems to use the same GPI matrix
+    // transformation internally as we do in method 3 below)
+    LONG oldInversion = GpiQueryYInversion(wps);
+    GpiEnableYInversion(wps, widget->height() - 1);
+
+    GpiDrawBits(wps, (PVOID) d->image->image.bits(), (PBITMAPINFO2) &bmh,
+                4, ptls, ROP_SRCCOPY, BBO_IGNORE);
+
+    GpiEnableYInversion(wps, oldInversion);
+
+#elif QT_BITMAP_MIRROR == 3
+
     // use the reflection + transformation matrix to flip the y axis.
     // This should be slower than flipping the image ourselves (unless this
@@ -302 +350 @@
     const QImage img = d->image->image;
 #endif
+
+
+
 #endif