FCL/sf/mw/qt: comparison src/gui/painting/qdrawhelper.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 #include <private/qdrawhelper_p.h>
 #include <private/qpaintengine_raster_p.h>
 #include <private/qpainter_p.h>
 #include <private/qdrawhelper_x86_p.h>
 #include <private/qdrawhelper_armv6_p.h>
+#include <private/qdrawhelper_neon_p.h>
 #include <private/qmath_p.h>
 #include <qmath.h>
 QT_BEGIN_NAMESPACE
 const uint *end = buffer + length;
 if (affine) {
 rx -= data->gradient.conical.center.x;
 ry -= data->gradient.conical.center.y;
 while (buffer < end) {
-qreal angle = atan2(ry, rx) + data->gradient.conical.angle;
+qreal angle = qAtan2(ry, rx) + data->gradient.conical.angle;
 *buffer = qt_gradient_pixel(&data->gradient, 1 - angle / (2*Q_PI));
 rx += data->m11;
 ry += data->m12;
 qreal rw = data->m23 * (y + 0.5)
 + data->m33 + data->m13 * (x + 0.5);
 if (!rw)
 rw = 1;
 while (buffer < end) {
-qreal angle = atan2(ry/rw - data->gradient.conical.center.x,
+qreal angle = qAtan2(ry/rw - data->gradient.conical.center.x,
 rx/rw - data->gradient.conical.center.y)
 + data->gradient.conical.angle;
 *buffer = qt_gradient_pixel(&data->gradient, 1. - angle / (2*Q_PI));
 else
 comp_func_HardLight_impl(dest, src, length, QPartialCoverage(const_alpha));
 }
 /*
-if 2.Sca < Sa
+if 2.Sca <= Sa
-Dca' = Dca.(Sa - (1 - Dca/Da).(2.Sca - Sa)) + Sca.(1 - Da) + Dca.(1 - Sa)
+Dca' = Dca.(Sa + (2.Sca - Sa).(1 - Dca/Da)) + Sca.(1 - Da) + Dca.(1 - Sa)
-otherwise if 8.Dca <= Da
+otherwise if 2.Sca > Sa and 4.Dca <= Da
-Dca' = Dca.(Sa - (1 - Dca/Da).(2.Sca - Sa).(3 - 8.Dca/Da)) + Sca.(1 - Da) + Dca.(1 - Sa)
+Dca' = Dca.Sa + Da.(2.Sca - Sa).(4.Dca/Da.(4.Dca/Da + 1).(Dca/Da - 1) + 7.Dca/Da) + Sca.(1 - Da) + Dca.(1 - Sa)
-otherwise
+otherwise if 2.Sca > Sa and 4.Dca > Da
-Dca' = (Dca.Sa + ((Dca/Da)^(0.5).Da - Dca).(2.Sca - Sa)) + Sca.(1 - Da) + Dca.(1 - Sa)
+Dca' = Dca.Sa + Da.(2.Sca - Sa).((Dca/Da)^0.5 - Dca/Da) + Sca.(1 - Da) + Dca.(1 - Sa)
 */
 static inline int soft_light_op(int dst, int src, int da, int sa)
 {
 const int src2 = src << 1;
 const int dst_np = da != 0 ? (255 * dst) / da : 0;
 const int temp = (src * (255 - da) + dst * (255 - sa)) * 255;
 if (src2 < sa)
-return (dst * ((sa * 255) - (255 - dst_np) * (src2 - sa)) + temp) / 65025;
+return (dst * (sa * 255 + (src2 - sa) * (255 - dst_np)) + temp) / 65025;
-else if (8 * dst <= da)
+else if (4 * dst <= da)
-return (dst * ((sa * 255) - ((255 - dst_np) * (src2 - sa) * ((3 * 255) - 8 * dst_np)) / 255) + temp) / 65025;
+return (dst * sa * 255 + da * (src2 - sa) * ((((16 * dst_np - 12 * 255) * dst_np + 3 * 65025) * dst_np) / 65025) + temp) / 65025;
 else {
-// sqrt is too expensive to do three times per pixel, so skipping it for now
+return (dst * sa * 255 + da * (src2 - sa) * (int(sqrt(qreal(dst_np * 255))) - dst_np) + temp) / 65025;
-// a future possibility is to use a LUT
-return ((dst * sa * 255) + (int(dst_np) * da - (dst * 255)) * (src2 - sa) + temp) / 65025;
 }
 }
 template <typename T>
 Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_SoftLight_impl(uint *dest, int length, uint color, const T &coverage)
 qt_pow_rgb_gamma[i] = uchar(i);
 qt_pow_rgb_invgamma[i] = uchar(i);
 }
 #else
 for (int i=0; i<256; ++i) {
-qt_pow_rgb_gamma[i] = uchar(qRound(pow(i / qreal(255.0), smoothing) * 255));
+qt_pow_rgb_gamma[i] = uchar(qRound(qPow(i / qreal(255.0), smoothing) * 255));
-qt_pow_rgb_invgamma[i] = uchar(qRound(pow(i / qreal(255.), 1 / smoothing) * 255));
+qt_pow_rgb_invgamma[i] = uchar(qRound(qPow(i / qreal(255.), 1 / smoothing) * 255));
 }
 #endif
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
 const qreal gray_gamma = 2.31;
 for (int i=0; i<256; ++i)
-qt_pow_gamma[i] = uint(qRound(pow(i / qreal(255.), gray_gamma) * 2047));
+qt_pow_gamma[i] = uint(qRound(qPow(i / qreal(255.), gray_gamma) * 2047));
 for (int i=0; i<2048; ++i)
-qt_pow_invgamma[i] = uchar(qRound(pow(i / 2047.0, 1 / gray_gamma) * 255));
+qt_pow_invgamma[i] = uchar(qRound(qPow(i / 2047.0, 1 / gray_gamma) * 255));
 #endif
 }
 static inline void rgbBlendPixel(quint32 *dst, int coverage, int sr, int sg, int sb)
 {
 QT_RECTFILL(qargb8555)
 QT_RECTFILL(qrgb888)
 QT_RECTFILL(qrgb444)
 QT_RECTFILL(qargb4444)
 #undef QT_RECTFILL
+inline static void qt_rectfill_nonpremul_quint32(QRasterBuffer *rasterBuffer,
+int x, int y, int width, int height,
+quint32 color)
+{
+qt_rectfill<quint32>(reinterpret_cast<quint32 *>(rasterBuffer->buffer()),
+INV_PREMUL(color), x, y, width, height, rasterBuffer->bytesPerLine());
+}
 // Map table for destination image format. Contains function pointers
 // for blends of various types unto the destination
 blend_color_generic,
 qt_gradient_quint32,
 qt_bitmapblit_quint32,
 qt_alphamapblit_quint32,
 qt_alphargbblit_quint32,
-qt_rectfill_quint32
+qt_rectfill_nonpremul_quint32
 },
 // Format_ARGB32_Premultiplied
 {
 blend_color_argb,
 qt_gradient_quint32,
 MMX3DNOW    = 0x4,
 MMX3DNOWEXT = 0x8,
 SSE         = 0x10,
 SSE2        = 0x20,
 CMOV        = 0x40,
-IWMMXT      = 0x80
+IWMMXT      = 0x80,
+NEON        = 0x100
 };
 static uint detectCPUFeatures()
 {
 #if defined (Q_OS_WINCE)
 return 0;
 #elif defined(QT_HAVE_IWMMXT)
 // runtime detection only available when running as a previlegied process
 static const bool doIWMMXT = !qgetenv("QT_NO_IWMMXT").toInt();
 return doIWMMXT ? IWMMXT : 0;
+#elif defined(QT_HAVE_NEON)
+static const bool doNEON = !qgetenv("QT_NO_NEON").toInt();
+return doNEON ? NEON : 0;
 #else
 uint features = 0;
 #if defined(__x86_64__) || defined(Q_OS_WIN64)
 features = MMX|SSE|SSE2|CMOV;
 #elif defined(__ia64__)
 qBlendFunctions[QImage::Format_RGB32][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_armv6;
 qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_armv6;
 qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_armv6;
 qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_armv6;
-#endif // Q_CC_RVCT && QT_HAVE_ARMV6
+#elif defined(QT_HAVE_NEON)
+if (features & NEON) {
+qBlendFunctions[QImage::Format_RGB32][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_neon;
+qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_neon;
+qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_neon;
+qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_neon;
+}
+#endif
 if (functionForModeSolidAsm) {
 const int destinationMode = QPainter::CompositionMode_Destination;
 functionForModeSolidAsm[destinationMode] = functionForModeSolid_C[destinationMode];

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7
child 7	f7bc934e204c
child 18	2f34d5167611