From 98cdc9edefa0f42c19779158b4b9dbec7b7ef966 Mon Sep 17 00:00:00 2001 From: LinuxUserGD Date: Wed, 20 Mar 2024 23:19:06 +0100 Subject: [PATCH] disable raster_64bit --- src/gui/image/qimage.cpp | 4 +- src/gui/painting/qcompositionfunctions.cpp | 84 +++++++++---------- src/gui/painting/qdrawhelper.cpp | 74 ++++++++-------- src/gui/painting/qdrawhelper_avx2.cpp | 6 +- src/gui/painting/qdrawhelper_p.h | 4 +- src/gui/painting/qdrawhelper_sse4.cpp | 2 +- src/gui/painting/qimagescale.cpp | 4 +- src/gui/painting/qpaintengine_raster.cpp | 6 +- tests/auto/gui/image/qimage/tst_qimage.cpp | 6 +- .../gui/painting/qpainter/tst_qpainter.cpp | 8 +- 10 files changed, 99 insertions(+), 99 deletions(-) diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 463a1e4a6d8..60bf88aac1c 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -4654,7 +4654,7 @@ QImage QImage::smoothScaled(int w, int h) const case QImage::Format_RGBX8888: #endif case QImage::Format_RGBA8888_Premultiplied: -#if QT_CONFIG(raster_64bit) +#if 0 case QImage::Format_RGBX64: case QImage::Format_RGBA64_Premultiplied: break; @@ -4845,7 +4845,7 @@ QImage Q_TRACE_INSTRUMENT(qtgui) QImage::transformed(const QTransform &matrix, Q case QImage::Format_RGBX8888: #endif case QImage::Format_RGBA8888_Premultiplied: -#if QT_CONFIG(raster_64bit) +#if 0 case QImage::Format_RGBX64: case QImage::Format_RGBA64_Premultiplied: #endif diff --git a/src/gui/painting/qcompositionfunctions.cpp b/src/gui/painting/qcompositionfunctions.cpp index 00fd749fe64..b43e2fd23cb 100644 --- a/src/gui/painting/qcompositionfunctions.cpp +++ b/src/gui/painting/qcompositionfunctions.cpp @@ -105,7 +105,7 @@ struct Rgba64OperationsBase { ::memcpy(dest, src, len * sizeof(Type)); } }; -#if QT_CONFIG(raster_64bit) +#if 0 const Rgba64OperationsBase::Type Rgba64OperationsBase::clear = QRgba64::fromRgba64(0); struct Rgba64OperationsC : public Rgba64OperationsBase @@ -288,7 +288,7 @@ typedef Rgba64OperationsNEON Rgba64Operations; typedef Rgba64OperationsC Rgba64Operations; #endif -#endif // QT_CONFIG(raster_64bit) +#endif // 0 #if QT_CONFIG(raster_fp) @@ -497,7 +497,7 @@ void QT_FASTCALL comp_func_Clear(uint *dest, const uint *, int length, uint cons comp_func_Clear_template(dest, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_Clear_rgb64(QRgba64 *dest, int length, QRgba64, uint const_alpha) { comp_func_Clear_template(dest, length, const_alpha); @@ -567,7 +567,7 @@ void QT_FASTCALL comp_func_Source(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL comp_func_Source_template(dest, src, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_Source_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha) { comp_func_solid_Source_template(dest, length, color, const_alpha); @@ -599,7 +599,7 @@ void QT_FASTCALL comp_func_Destination(uint *, const uint *, int, uint) { } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_Destination_rgb64(QRgba64 *, int, QRgba64, uint) { } @@ -677,7 +677,7 @@ void QT_FASTCALL comp_func_SourceOver(uint *Q_DECL_RESTRICT dest, const uint *Q_ comp_func_SourceOver_template(dest, src, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_SourceOver_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha) { comp_func_solid_SourceOver_template(dest, length, color, const_alpha); @@ -751,7 +751,7 @@ void QT_FASTCALL comp_func_DestinationOver(uint *Q_DECL_RESTRICT dest, const uin comp_func_DestinationOver_template(dest, src, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_DestinationOver_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha) { comp_func_solid_DestinationOver_template(dest, length, color, const_alpha); @@ -829,7 +829,7 @@ void QT_FASTCALL comp_func_SourceIn(uint *Q_DECL_RESTRICT dest, const uint *Q_DE comp_func_SourceIn_template(dest, src, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_SourceIn_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha) { comp_func_solid_SourceIn_template(dest, length, color, const_alpha); @@ -902,7 +902,7 @@ void QT_FASTCALL comp_func_DestinationIn(uint *Q_DECL_RESTRICT dest, const uint comp_func_DestinationIn_template(dest, src, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_DestinationIn_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha) { comp_func_solid_DestinationIn_template(dest, length, color, const_alpha); @@ -978,7 +978,7 @@ void QT_FASTCALL comp_func_SourceOut(uint *Q_DECL_RESTRICT dest, const uint *Q_D comp_func_SourceOut_template(dest, src, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_SourceOut_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha) { comp_func_solid_SourceOut_template(dest, length, color, const_alpha); @@ -1051,7 +1051,7 @@ void QT_FASTCALL comp_func_DestinationOut(uint *Q_DECL_RESTRICT dest, const uint comp_func_DestinationOut_template(dest, src, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_DestinationOut_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha) { comp_func_solid_DestinationOut_template(dest, length, color, const_alpha); @@ -1124,7 +1124,7 @@ void QT_FASTCALL comp_func_SourceAtop(uint *Q_DECL_RESTRICT dest, const uint *Q_ comp_func_SourceAtop_template(dest, src, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_SourceAtop_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha) { comp_func_solid_SourceAtop_template(dest, length, color, const_alpha); @@ -1202,7 +1202,7 @@ void QT_FASTCALL comp_func_DestinationAtop(uint *Q_DECL_RESTRICT dest, const uin comp_func_DestinationAtop_template(dest, src, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_DestinationAtop_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha) { comp_func_solid_DestinationAtop_template(dest, length, color, const_alpha); @@ -1276,7 +1276,7 @@ void QT_FASTCALL comp_func_XOR(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RE comp_func_XOR_template(dest, src, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_XOR_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha) { comp_func_solid_XOR_template(dest, length, color, const_alpha); @@ -1305,7 +1305,7 @@ struct QFullCoverage { { *dest = src; } -#if QT_CONFIG(raster_64bit) +#if 0 inline void store(QRgba64 *dest, const QRgba64 src) const { *dest = src; @@ -1335,7 +1335,7 @@ struct QPartialCoverage { { store_template(dest, src); } -#if QT_CONFIG(raster_64bit) +#if 0 inline void store(QRgba64 *dest, const QRgba64 src) const { store_template(dest, src); @@ -1358,7 +1358,7 @@ static inline int mix_alpha(int da, int sa) return 255 - qt_div_255((255 - sa) * (255 - da)); } -#if QT_CONFIG(raster_64bit) +#if 0 static inline uint mix_alpha_rgb64(uint da, uint sa) { return 65535U - qt_div_65535((65535U - sa) * (65535U - da)); @@ -1429,7 +1429,7 @@ void QT_FASTCALL comp_func_Plus(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_R comp_func_Plus_template(dest, src, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_Plus_rgb64(QRgba64 *dest, int length, QRgba64 color, uint const_alpha) { comp_func_solid_Plus_template(dest, length, color, const_alpha); @@ -1492,7 +1492,7 @@ void QT_FASTCALL comp_func_solid_Multiply(uint *dest, int length, uint color, ui comp_func_solid_Multiply_impl(dest, length, color, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 static inline uint multiply_op_rgb64(uint dst, uint src, uint da, uint sa) { return qt_div_65535(src * dst + src * (65535U - da) + dst * (65535U - sa)); @@ -1598,7 +1598,7 @@ void QT_FASTCALL comp_func_Multiply(uint *Q_DECL_RESTRICT dest, const uint *Q_DE comp_func_Multiply_impl(dest, src, length, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void comp_func_Multiply_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { @@ -1695,7 +1695,7 @@ void QT_FASTCALL comp_func_solid_Screen(uint *dest, int length, uint color, uint comp_func_solid_Screen_impl(dest, length, color, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void comp_func_solid_Screen_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { @@ -1790,7 +1790,7 @@ void QT_FASTCALL comp_func_Screen(uint *dest, const uint *src, int length, uint comp_func_Screen_impl(dest, src, length, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void comp_func_Screen_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { @@ -1898,7 +1898,7 @@ void QT_FASTCALL comp_func_solid_Overlay(uint *dest, int length, uint color, uin comp_func_solid_Overlay_impl(dest, length, color, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 static inline uint overlay_op_rgb64(uint dst, uint src, uint da, uint sa) { const uint temp = src * (65535U - da) + dst * (65535U - sa); @@ -2011,7 +2011,7 @@ void QT_FASTCALL comp_func_Overlay(uint *Q_DECL_RESTRICT dest, const uint *Q_DEC comp_func_Overlay_impl(dest, src, length, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void comp_func_Overlay_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { @@ -2113,7 +2113,7 @@ void QT_FASTCALL comp_func_solid_Darken(uint *dest, int length, uint color, uint comp_func_solid_Darken_impl(dest, length, color, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 static inline uint darken_op_rgb64(uint dst, uint src, uint da, uint sa) { return qt_div_65535(qMin(src * da, dst * sa) + src * (65535U - da) + dst * (65535U - sa)); @@ -2218,7 +2218,7 @@ void QT_FASTCALL comp_func_Darken(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL comp_func_Darken_impl(dest, src, length, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void comp_func_Darken_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { @@ -2321,7 +2321,7 @@ void QT_FASTCALL comp_func_solid_Lighten(uint *dest, int length, uint color, uin } -#if QT_CONFIG(raster_64bit) +#if 0 static inline uint lighten_op_rgb64(uint dst, uint src, uint da, uint sa) { return qt_div_65535(qMax(src * da, dst * sa) + src * (65535U - da) + dst * (65535U - sa)); @@ -2426,7 +2426,7 @@ void QT_FASTCALL comp_func_Lighten(uint *Q_DECL_RESTRICT dest, const uint *Q_DEC comp_func_Lighten_impl(dest, src, length, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void comp_func_Lighten_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { @@ -2542,7 +2542,7 @@ void QT_FASTCALL comp_func_solid_ColorDodge(uint *dest, int length, uint color, comp_func_solid_ColorDodge_impl(dest, length, color, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 static inline uint color_dodge_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 sa) { const qint64 sa_da = sa * da; @@ -2667,7 +2667,7 @@ void QT_FASTCALL comp_func_ColorDodge(uint *Q_DECL_RESTRICT dest, const uint *Q_ comp_func_ColorDodge_impl(dest, src, length, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void comp_func_ColorDodge_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { @@ -2783,7 +2783,7 @@ void QT_FASTCALL comp_func_solid_ColorBurn(uint *dest, int length, uint color, u comp_func_solid_ColorBurn_impl(dest, length, color, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 static inline uint color_burn_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 sa) { const qint64 src_da = src * da; @@ -2908,7 +2908,7 @@ void QT_FASTCALL comp_func_ColorBurn(uint *Q_DECL_RESTRICT dest, const uint *Q_D comp_func_ColorBurn_impl(dest, src, length, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void comp_func_ColorBurn_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { @@ -3017,7 +3017,7 @@ void QT_FASTCALL comp_func_solid_HardLight(uint *dest, int length, uint color, u comp_func_solid_HardLight_impl(dest, length, color, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 static inline uint hardlight_op_rgb64(uint dst, uint src, uint da, uint sa) { const uint temp = src * (65535U - da) + dst * (65535U - sa); @@ -3132,7 +3132,7 @@ void QT_FASTCALL comp_func_HardLight(uint *Q_DECL_RESTRICT dest, const uint *Q_D comp_func_HardLight_impl(dest, src, length, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void comp_func_HardLight_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { @@ -3248,7 +3248,7 @@ void QT_FASTCALL comp_func_solid_SoftLight(uint *dest, int length, uint color, u comp_func_solid_SoftLight_impl(dest, length, color, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 static inline uint soft_light_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 sa) { const qint64 src2 = src << 1; @@ -3375,7 +3375,7 @@ void QT_FASTCALL comp_func_SoftLight(uint *Q_DECL_RESTRICT dest, const uint *Q_D comp_func_SoftLight_impl(dest, src, length, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void comp_func_SoftLight_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { @@ -3477,7 +3477,7 @@ void QT_FASTCALL comp_func_solid_Difference(uint *dest, int length, uint color, comp_func_solid_Difference_impl(dest, length, color, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 static inline uint difference_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 sa) { return src + dst - qt_div_65535(2 * qMin(src * da, dst * sa)); @@ -3582,7 +3582,7 @@ void QT_FASTCALL comp_func_Difference(uint *Q_DECL_RESTRICT dest, const uint *Q_ comp_func_Difference_impl(dest, src, length, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void comp_func_Difference_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { @@ -3678,7 +3678,7 @@ void QT_FASTCALL comp_func_solid_Exclusion(uint *dest, int length, uint color, u comp_func_solid_Exclusion_impl(dest, length, color, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void QT_FASTCALL comp_func_solid_Exclusion_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { @@ -3773,7 +3773,7 @@ void QT_FASTCALL comp_func_Exclusion(uint *Q_DECL_RESTRICT dest, const uint *Q_D comp_func_Exclusion_impl(dest, src, length, QPartialCoverage(const_alpha)); } -#if QT_CONFIG(raster_64bit) +#if 0 template static inline void comp_func_Exclusion_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { @@ -4183,7 +4183,7 @@ CompositionFunctionSolid qt_functionForModeSolid_C[] = { }; CompositionFunctionSolid64 qt_functionForModeSolid64_C[] = { -#if QT_CONFIG(raster_64bit) +#if 0 comp_func_solid_SourceOver_rgb64, comp_func_solid_DestinationOver_rgb64, comp_func_solid_Clear_rgb64, @@ -4293,7 +4293,7 @@ CompositionFunction qt_functionForMode_C[] = { }; CompositionFunction64 qt_functionForMode64_C[] = { -#if QT_CONFIG(raster_64bit) +#if 0 comp_func_SourceOver_rgb64, comp_func_DestinationOver_rgb64, comp_func_Clear_rgb64, diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 301e430b11c..7f6b4662428 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -129,7 +129,7 @@ constexpr Fetch1PixelFunc fetch1PixelTable[QPixelLayout::BPPCount] = { fetch1Pixel, }; -#if QT_CONFIG(raster_64bit) +#if 0 static void QT_FASTCALL convertRGBA64ToRGBA64PM(QRgba64 *buffer, int count) { for (int i = 0; i < count; ++i) @@ -393,7 +393,7 @@ static DestFetchProc destFetchProc[QImage::NImageFormats] = destFetch, // Format_RGBA32FPx4_Premultiplied }; -#if QT_CONFIG(raster_64bit) +#if 0 static QRgba64 *QT_FASTCALL destFetch64(QRgba64 *buffer, QRasterBuffer *rasterBuffer, int x, int y, int length) { const QPixelLayout *layout = &qPixelLayouts[rasterBuffer->format]; @@ -697,7 +697,7 @@ static DestStoreProc destStoreProc[QImage::NImageFormats] = destStore, // Format_RGBA32FPx4_Premultiplied }; -#if QT_CONFIG(raster_64bit) +#if 0 static void QT_FASTCALL destStore64(QRasterBuffer *rasterBuffer, int x, int y, const QRgba64 *buffer, int length) { auto store = qStoreFromRGBA64PM[rasterBuffer->format]; @@ -856,7 +856,7 @@ static const uint *QT_FASTCALL fetchUntransformedRGB16(uint *buffer, const Opera return buffer; } -#if QT_CONFIG(raster_64bit) +#if 0 static const QRgba64 *QT_FASTCALL fetchUntransformed64(QRgba64 *buffer, const Operator *, const QSpanData *data, int y, int x, int length) { @@ -1087,7 +1087,7 @@ static const uint *QT_FASTCALL fetchTransformed(uint *buffer, const Operator *, return buffer; } -#if QT_CONFIG(raster_64bit) +#if 0 template /* either BlendTransformed or BlendTransformedTiled */ static const QRgba64 *QT_FASTCALL fetchTransformed64(QRgba64 *buffer, const Operator *, const QSpanData *data, int y, int x, int length) @@ -2457,7 +2457,7 @@ static const uint *QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Oper return buffer; } -#if QT_CONFIG(raster_64bit) +#if 0 template static const QRgba64 *QT_FASTCALL fetchTransformedBilinear64_uint32(QRgba64 *buffer, const QSpanData *data, int y, int x, int length) @@ -3158,7 +3158,7 @@ static inline SourceFetchProc getSourceFetch(TextureBlendType blendType, QImage: return sourceFetchGeneric[blendType]; } -#if QT_CONFIG(raster_64bit) +#if 0 static const SourceFetchProc64 sourceFetchGeneric64[NBlendTypes] = { fetchUntransformed64, // Untransformed fetchUntransformed64, // Tiled @@ -3211,7 +3211,7 @@ static uint qt_gradient_pixel_fixed(const QGradientData *data, int fixed_pos) return data->colorTable32[qt_gradient_clamp(data, ipos)]; } -#if QT_CONFIG(raster_64bit) +#if 0 static const QRgba64& qt_gradient_pixel64_fixed(const QGradientData *data, int fixed_pos) { int ipos = (fixed_pos + (FIXPT_SIZE / 2)) >> FIXPT_BITS; @@ -3268,7 +3268,7 @@ class GradientBase32 } }; -#if QT_CONFIG(raster_64bit) +#if 0 class GradientBase64 { public: @@ -3392,7 +3392,7 @@ static const uint * QT_FASTCALL qt_fetch_linear_gradient(uint *buffer, const Ope return qt_fetch_linear_gradient_template(buffer, op, data, y, x, length); } -#if QT_CONFIG(raster_64bit) +#if 0 static const QRgba64 * QT_FASTCALL qt_fetch_linear_gradient_rgb64(QRgba64 *buffer, const Operator *op, const QSpanData *data, int y, int x, int length) { @@ -3472,7 +3472,7 @@ const uint * QT_FASTCALL qt_fetch_radial_gradient_plain(uint *buffer, const Oper static SourceFetchProc qt_fetch_radial_gradient = qt_fetch_radial_gradient_plain; -#if QT_CONFIG(raster_64bit) +#if 0 const QRgba64 * QT_FASTCALL qt_fetch_radial_gradient_rgb64(QRgba64 *buffer, const Operator *op, const QSpanData *data, int y, int x, int length) { @@ -3545,7 +3545,7 @@ static const uint * QT_FASTCALL qt_fetch_conical_gradient(uint *buffer, const Op return qt_fetch_conical_gradient_template(buffer, data, y, x, length); } -#if QT_CONFIG(raster_64bit) +#if 0 static const QRgba64 * QT_FASTCALL qt_fetch_conical_gradient_rgb64(QRgba64 *buffer, const Operator *, const QSpanData *data, int y, int x, int length) { @@ -3566,7 +3566,7 @@ extern CompositionFunctionSolid64 qt_functionForModeSolid64_C[]; extern CompositionFunctionSolidFP qt_functionForModeSolidFP_C[]; static const CompositionFunctionSolid *functionForModeSolid = qt_functionForModeSolid_C; -#if QT_CONFIG(raster_64bit) +#if 0 static const CompositionFunctionSolid64 *functionForModeSolid64 = qt_functionForModeSolid64_C; #endif #if QT_CONFIG(raster_fp) @@ -3578,7 +3578,7 @@ extern CompositionFunction64 qt_functionForMode64_C[]; extern CompositionFunctionFP qt_functionForModeFP_C[]; static const CompositionFunction *functionForMode = qt_functionForMode_C; -#if QT_CONFIG(raster_64bit) +#if 0 static const CompositionFunction64 *functionForMode64 = qt_functionForMode64_C; #endif #if QT_CONFIG(raster_fp) @@ -3624,7 +3624,7 @@ static inline Operator getOperator(const QSpanData *data, const QT_FT_Span *span solidSource = !data->gradient.alphaColor; getLinearGradientValues(&op.linear, data); op.srcFetch = qt_fetch_linear_gradient; -#if QT_CONFIG(raster_64bit) +#if 0 op.srcFetch64 = qt_fetch_linear_gradient_rgb64; #endif #if QT_CONFIG(raster_fp) @@ -3635,7 +3635,7 @@ static inline Operator getOperator(const QSpanData *data, const QT_FT_Span *span solidSource = !data->gradient.alphaColor; getRadialGradientValues(&op.radial, data); op.srcFetch = qt_fetch_radial_gradient; -#if QT_CONFIG(raster_64bit) +#if 0 op.srcFetch64 = qt_fetch_radial_gradient_rgb64; #endif #if QT_CONFIG(raster_fp) @@ -3645,7 +3645,7 @@ static inline Operator getOperator(const QSpanData *data, const QT_FT_Span *span case QSpanData::ConicalGradient: solidSource = !data->gradient.alphaColor; op.srcFetch = qt_fetch_conical_gradient; -#if QT_CONFIG(raster_64bit) +#if 0 op.srcFetch64 = qt_fetch_conical_gradient_rgb64; #endif #if QT_CONFIG(raster_fp) @@ -3655,7 +3655,7 @@ static inline Operator getOperator(const QSpanData *data, const QT_FT_Span *span case QSpanData::Texture: solidSource = !data->texture.hasAlpha; op.srcFetch = getSourceFetch(getBlendType(data), data->texture.format); -#if QT_CONFIG(raster_64bit) +#if 0 op.srcFetch64 = getSourceFetch64(getBlendType(data), data->texture.format);; #endif #if QT_CONFIG(raster_fp) @@ -3666,7 +3666,7 @@ static inline Operator getOperator(const QSpanData *data, const QT_FT_Span *span Q_UNREACHABLE(); break; } -#if !QT_CONFIG(raster_64bit) +#if !0 op.srcFetch64 = nullptr; #endif #if !QT_CONFIG(raster_fp) @@ -3678,7 +3678,7 @@ static inline Operator getOperator(const QSpanData *data, const QT_FT_Span *span op.mode = QPainter::CompositionMode_Source; op.destFetch = destFetchProc[data->rasterBuffer->format]; -#if QT_CONFIG(raster_64bit) +#if 0 op.destFetch64 = destFetchProc64[data->rasterBuffer->format]; #else op.destFetch64 = nullptr; @@ -3704,7 +3704,7 @@ static inline Operator getOperator(const QSpanData *data, const QT_FT_Span *span // But don't clear passthrough destFetch as they are just as fast and save destStore. if (op.destFetch != destFetchARGB32P) op.destFetch = destFetchUndefined; -#if QT_CONFIG(raster_64bit) +#if 0 if (op.destFetch64 != destFetchRGB64) op.destFetch64 = destFetch64Undefined; #endif @@ -3718,7 +3718,7 @@ static inline Operator getOperator(const QSpanData *data, const QT_FT_Span *span op.destStore = destStoreProc[data->rasterBuffer->format]; op.funcSolid = functionForModeSolid[op.mode]; op.func = functionForMode[op.mode]; -#if QT_CONFIG(raster_64bit) +#if 0 op.destStore64 = destStoreProc64[data->rasterBuffer->format]; op.funcSolid64 = functionForModeSolid64[op.mode]; op.func64 = functionForMode64[op.mode]; @@ -3878,7 +3878,7 @@ static void blend_color_argb(int count, const QT_FT_Span *spans, void *userData) static void blend_color_generic_rgb64(int count, const QT_FT_Span *spans, void *userData) { -#if QT_CONFIG(raster_64bit) +#if 0 QSpanData *data = reinterpret_cast(userData); const Operator op = getOperator(data, nullptr, 0); if (!op.funcSolid64) { @@ -4061,7 +4061,7 @@ class BlendSrcGeneric : public QBlendBase } }; -#if QT_CONFIG(raster_64bit) +#if 0 class BlendSrcGenericRGB64 : public QBlendBase { public: @@ -4146,7 +4146,7 @@ static void blend_src_generic(int count, const QT_FT_Span *spans, void *userData handleSpans(count, spans, data, op); } -#if QT_CONFIG(raster_64bit) +#if 0 static void blend_src_generic_rgb64(int count, const QT_FT_Span *spans, void *userData) { QSpanData *data = reinterpret_cast(userData); @@ -4227,7 +4227,7 @@ static void blend_untransformed_generic(int count, const QT_FT_Span *spans, void QT_THREAD_PARALLEL_FILLS(function); } -#if QT_CONFIG(raster_64bit) +#if 0 static void blend_untransformed_generic_rgb64(int count, const QT_FT_Span *spans, void *userData) { QSpanData *data = reinterpret_cast(userData); @@ -4550,7 +4550,7 @@ static void blend_tiled_generic(int count, const QT_FT_Span *spans, void *userDa QT_THREAD_PARALLEL_FILLS(function); } -#if QT_CONFIG(raster_64bit) +#if 0 static void blend_tiled_generic_rgb64(int count, const QT_FT_Span *spans, void *userData) { QSpanData *data = reinterpret_cast(userData); @@ -4897,7 +4897,7 @@ static const ProcessSpans processTextureSpansGeneric[NBlendTypes] = { blend_src_generic // TransformedBilinearTiled }; -#if QT_CONFIG(raster_64bit) +#if 0 static const ProcessSpans processTextureSpansGeneric64[NBlendTypes] = { blend_untransformed_generic_rgb64, // Untransformed blend_tiled_generic_rgb64, // Tiled @@ -4952,10 +4952,10 @@ void qBlendTexture(int count, const QT_FT_Span *spans, void *userData) case QImage::Format_RGBA32FPx4: case QImage::Format_RGBA32FPx4_Premultiplied: #endif -#if QT_CONFIG(raster_64bit) +#if 0 proc = processTextureSpansGeneric64[blendType]; break; -#endif // QT_CONFIG(raster_64bit) +#endif // 0 #if QT_CONFIG(raster_fp) case QImage::Format_RGBX16FPx4: case QImage::Format_RGBA16FPx4: @@ -5030,7 +5030,7 @@ static void blend_vertical_gradient(int count, const QT_FT_Span *spans, void *us while (count--) { int y = spans->y; -#if QT_CONFIG(raster_64bit) +#if 0 data->solidColor = qt_gradient_pixel64_fixed(&data->gradient, yinc * y + off); #else data->solidColor = qt_gradient_pixel_fixed(&data->gradient, yinc * y + off); @@ -5074,11 +5074,11 @@ void qBlendGradient(int count, const QT_FT_Span *spans, void *userData) case QImage::Format_RGBA32FPx4: case QImage::Format_RGBA32FPx4_Premultiplied: #endif -#if QT_CONFIG(raster_64bit) +#if 0 if (isVerticalGradient) return blend_vertical_gradient(count, spans, userData); return blend_src_generic_rgb64(count, spans, userData); -#endif // QT_CONFIG(raster_64bit) +#endif // 0 #if QT_CONFIG(raster_fp) case QImage::Format_RGBX16FPx4: case QImage::Format_RGBA16FPx4: @@ -5228,7 +5228,7 @@ static inline void alphamapblend_argb32(quint32 *dst, int coverage, QRgba64 srcL } } -#if QT_CONFIG(raster_64bit) +#if 0 static inline void grayBlendPixel(QRgba64 &dst, int coverage, QRgba64 srcLinear, const QColorTrcLut *colorProfile) { @@ -5618,7 +5618,7 @@ static inline void alphargbblend_argb32(quint32 *dst, uint coverage, const QRgba } } -#if QT_CONFIG(raster_64bit) +#if 0 static inline void rgbBlendPixel(QRgba64 &dst, int coverage, QRgba64 slinear, const QColorTrcLut *colorProfile) { // Do a gammacorrected RGB alphablend... @@ -6459,7 +6459,7 @@ static void qInitDrawhelperFunctions() qStoreFromRGBA64PM[QImage::Format_RGBA8888] = storeRGBA8888FromRGBA64PM_sse4; qStoreFromRGBA64PM[QImage::Format_RGBX64] = storeRGBx64FromRGBA64PM_sse4; qStoreFromRGBA64PM[QImage::Format_RGBA64] = storeRGBA64FromRGBA64PM_sse4; -#if QT_CONFIG(raster_64bit) +#if 0 destStoreProc64[QImage::Format_ARGB32] = destStore64ARGB32_sse4; destStoreProc64[QImage::Format_RGBA8888] = destStore64RGBA8888_sse4; #endif @@ -6499,7 +6499,7 @@ static void qInitDrawhelperFunctions() qt_functionForMode_C[QPainter::CompositionMode_Source] = comp_func_Source_avx2; qt_functionForMode_C[QPainter::CompositionMode_SourceOver] = comp_func_SourceOver_avx2; qt_functionForModeSolid_C[QPainter::CompositionMode_SourceOver] = comp_func_solid_SourceOver_avx2; -#if QT_CONFIG(raster_64bit) +#if 0 extern void QT_FASTCALL comp_func_Source_rgb64_avx2(QRgba64 *destPixels, const QRgba64 *srcPixels, int length, uint const_alpha); extern void QT_FASTCALL comp_func_SourceOver_rgb64_avx2(QRgba64 *destPixels, const QRgba64 *srcPixels, int length, uint const_alpha); extern void QT_FASTCALL comp_func_solid_SourceOver_rgb64_avx2(QRgba64 *destPixels, int length, QRgba64 color, uint const_alpha); diff --git a/src/gui/painting/qdrawhelper_avx2.cpp b/src/gui/painting/qdrawhelper_avx2.cpp index 34de69ecf45..a6184efe4fa 100644 --- a/src/gui/painting/qdrawhelper_avx2.cpp +++ b/src/gui/painting/qdrawhelper_avx2.cpp @@ -360,7 +360,7 @@ void QT_FASTCALL comp_func_SourceOver_avx2(uint *destPixels, const uint *srcPixe BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_AVX2(dst, src, length, const_alpha); } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_SourceOver_rgb64_avx2(QRgba64 *dst, const QRgba64 *src, int length, uint const_alpha) { Q_ASSERT(const_alpha < 256); // const_alpha is in [0-255] @@ -485,7 +485,7 @@ void QT_FASTCALL comp_func_Source_avx2(uint *dst, const uint *src, int length, u } } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_Source_rgb64_avx2(QRgba64 *dst, const QRgba64 *src, int length, uint const_alpha) { Q_ASSERT(const_alpha < 256); // const_alpha is in [0-255] @@ -586,7 +586,7 @@ void QT_FASTCALL comp_func_solid_SourceOver_avx2(uint *destPixels, int length, u } } -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL comp_func_solid_SourceOver_rgb64_avx2(QRgba64 *destPixels, int length, QRgba64 color, uint const_alpha) { Q_ASSERT(const_alpha < 256); // const_alpha is in [0-255] diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h index 833ddd7b166..9ed7c8b2e0e 100644 --- a/src/gui/painting/qdrawhelper_p.h +++ b/src/gui/painting/qdrawhelper_p.h @@ -265,7 +265,7 @@ struct QGradientData #define GRADIENT_STOPTABLE_SIZE 1024 #define GRADIENT_STOPTABLE_SIZE_SHIFT 10 -#if QT_CONFIG(raster_64bit) || QT_CONFIG(raster_fp) +#if 0 || QT_CONFIG(raster_fp) const QRgba64 *colorTable64; //[GRADIENT_STOPTABLE_SIZE]; #endif const QRgb *colorTable32; //[GRADIENT_STOPTABLE_SIZE]; @@ -370,7 +370,7 @@ static inline uint qt_gradient_pixel(const QGradientData *data, qreal pos) return data->colorTable32[qt_gradient_clamp(data, ipos)]; } -#if QT_CONFIG(raster_64bit) +#if 0 static inline const QRgba64& qt_gradient_pixel64(const QGradientData *data, qreal pos) { int ipos = int(pos * (GRADIENT_STOPTABLE_SIZE - 1) + qreal(0.5)); diff --git a/src/gui/painting/qdrawhelper_sse4.cpp b/src/gui/painting/qdrawhelper_sse4.cpp index a7b4e6ba762..dc2862f50e5 100644 --- a/src/gui/painting/qdrawhelper_sse4.cpp +++ b/src/gui/painting/qdrawhelper_sse4.cpp @@ -473,7 +473,7 @@ template void QT_FASTCALL storeA2RGB30PMFromARGB32PM_sse4(uchar *dest, const uint *src, int index, int count, const QList *, QDitherInfo *); -#if QT_CONFIG(raster_64bit) +#if 0 void QT_FASTCALL destStore64ARGB32_sse4(QRasterBuffer *rasterBuffer, int x, int y, const QRgba64 *buffer, int length) { uint *dest = (uint*)rasterBuffer->scanLine(y) + x; diff --git a/src/gui/painting/qimagescale.cpp b/src/gui/painting/qimagescale.cpp index a636635fd5d..cecae45c801 100644 --- a/src/gui/painting/qimagescale.cpp +++ b/src/gui/painting/qimagescale.cpp @@ -541,7 +541,7 @@ static void qt_qimageScaleAARGBA_down_xy(QImageScaleInfo *isi, unsigned int *des multithread_pixels_function(isi, dh, scaleSection); } -#if QT_CONFIG(raster_64bit) +#if 0 static void qt_qimageScaleRgba64_up_x_down_y(QImageScaleInfo *isi, QRgba64 *dest, int dw, int dh, int dow, int sow); @@ -1202,7 +1202,7 @@ QImage qSmoothScaleImage(const QImage &src, int dw, int dh) dw, dh, dw, src.bytesPerLine() / 16); else #endif -#if QT_CONFIG(raster_64bit) +#if 0 if (src.depth() > 32) qt_qimageScaleRgba64(scaleinfo, (QRgba64 *)buffer.scanLine(0), dw, dh, dw, src.bytesPerLine() / 8); diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 582ad500f8d..b9cc7bb790d 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -4499,7 +4499,7 @@ void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode auto cacheInfo = qt_gradient_cache()->getBuffer(*g, alpha); gradient.colorTable32 = cacheInfo->buffer32; -#if QT_CONFIG(raster_64bit) || QT_CONFIG(raster_fp) +#if 0 || QT_CONFIG(raster_fp) gradient.colorTable64 = cacheInfo->buffer64; #endif cachedGradient = std::move(cacheInfo); @@ -4523,7 +4523,7 @@ void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode auto cacheInfo = qt_gradient_cache()->getBuffer(*g, alpha); gradient.colorTable32 = cacheInfo->buffer32; -#if QT_CONFIG(raster_64bit) || QT_CONFIG(raster_fp) +#if 0 || QT_CONFIG(raster_fp) gradient.colorTable64 = cacheInfo->buffer64; #endif cachedGradient = std::move(cacheInfo); @@ -4551,7 +4551,7 @@ void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode auto cacheInfo = qt_gradient_cache()->getBuffer(*g, alpha); gradient.colorTable32 = cacheInfo->buffer32; -#if QT_CONFIG(raster_64bit) || QT_CONFIG(raster_fp) +#if 0 || QT_CONFIG(raster_fp) gradient.colorTable64 = cacheInfo->buffer64; #endif cachedGradient = std::move(cacheInfo); diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index 1af4881b9d7..1a04ef74f88 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -1799,7 +1799,7 @@ void tst_QImage::smoothScale2_data() int sizes[] = { 2, 3, 4, 6, 7, 8, 10, 16, 20, 32, 40, 64, 100, 101, 128, 0 }; QImage::Format formats[] = { QImage::Format_RGB32, QImage::Format_ARGB32_Premultiplied, -#if QT_CONFIG(raster_64bit) +#if 0 QImage::Format_RGBX64, QImage::Format_RGBA64_Premultiplied, #endif @@ -1966,7 +1966,7 @@ void tst_QImage::smoothScale4_data() QTest::addColumn("format"); QTest::newRow("RGB32") << QImage::Format_RGB32; -#if QT_CONFIG(raster_64bit) +#if 0 QTest::newRow("RGBx64") << QImage::Format_RGBX64; #endif #if QT_CONFIG(raster_fp) @@ -3814,7 +3814,7 @@ void tst_QImage::ditherGradient_data() QTest::newRow("argb32pm -> argb6666pm (no dither)") << rgb32 << QImage::Format_ARGB6666_Premultiplied << 0 << 64; QTest::newRow("argb32pm -> argb6666pm (dithering)") << rgb32 << QImage::Format_ARGB6666_Premultiplied << int(Qt::PreferDither | Qt::OrderedDither) << 129; -#if QT_CONFIG(raster_64bit) +#if 0 QImage rgb30(1024, 16, QImage::Format_RGB30); QLinearGradient gradient30(QRectF(rgb30.rect()).topLeft(), QRectF(rgb30.rect()).topRight()); gradient30.setColorAt(0.0, QColor(0, 0, 0)); diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp index 15735aecf78..b6b9d312966 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp @@ -163,7 +163,7 @@ private slots: void gradientPixelFormat_data(); void gradientPixelFormat(); -#if QT_CONFIG(raster_64bit) +#if 0 void linearGradientRgb30_data(); void linearGradientRgb30(); void radialGradientRgb30_data(); @@ -3966,7 +3966,7 @@ void tst_QPainter::gradientInterpolation() } } -#if QT_CONFIG(raster_64bit) +#if 0 void tst_QPainter::linearGradientRgb30_data() { QTest::addColumn("stop0"); @@ -5036,7 +5036,7 @@ void tst_QPainter::blendARGBonRGB_data() << QPainter::CompositionMode_SourceOver << qRgba(255, 0, 0, 85) << 85; QTest::newRow("ARGB_PM over RGB30") << QImage::Format_RGB30 << QImage::Format_ARGB32_Premultiplied << QPainter::CompositionMode_SourceOver << qRgba(85, 0, 0, 85) << 85; -#if QT_CONFIG(raster_64bit) +#if 0 QTest::newRow("ARGB@85 source RGB30") << QImage::Format_RGB30 << QImage::Format_ARGB32 << QPainter::CompositionMode_Source << qRgba(255, 0, 0, 85) << 85; QTest::newRow("ARGB@120 source RGB30") << QImage::Format_RGB30 << QImage::Format_ARGB32 @@ -5044,7 +5044,7 @@ void tst_QPainter::blendARGBonRGB_data() #endif QTest::newRow("ARGB_PM@85 source RGB30") << QImage::Format_RGB30 << QImage::Format_ARGB32_Premultiplied << QPainter::CompositionMode_Source << qRgba(85, 0, 0, 85) << 85; -#if QT_CONFIG(raster_64bit) +#if 0 QTest::newRow("ARGB_PM@180 source RGB30") << QImage::Format_RGB30 << QImage::Format_ARGB32_Premultiplied << QPainter::CompositionMode_Source << qRgba(180, 0, 0, 180) << 170; #endif