diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-04-12 13:27:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-04-12 12:58:40 +0000 |
| commit | 2cc977665260c828b9652fdc49f145577bf39ebc (patch) | |
| tree | 187d6d5ce6ba04cca940d959156c7ca5a2e966c6 /tests/benchmarks | |
| parent | a88063008d0715091e33022d8da5b589ce568b38 (diff) | |
Cut down on drawPixmap and drawImage combinations
There are too many combinations and the data is not very useful when
it is impossible to get an overview. This cuts a few rare formats out
and reduces the sizes tested to one small for overhead benchmarking
and one large for bandwidth benchmarking.
Change-Id: If0fe33e0e02b8cba771094a79072036f2cd4cf48
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'tests/benchmarks')
| -rw-r--r-- | tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp index f2e6973e27..0248d6f855 100644 --- a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp @@ -128,7 +128,7 @@ QPixmap rasterPixmap(const QImage &image) QPlatformPixmap *data = new QRasterPlatformPixmap(QPlatformPixmap::PixmapType); - data->fromImage(image, Qt::AutoColor); + data->fromImage(image, Qt::AutoColor | Qt::NoFormatConversion); return QPixmap(data); } @@ -614,9 +614,7 @@ void tst_QPainter::drawPixmapImage_data_helper(bool pixmaps) QTest::addColumn<int>("type"); // 0 = circle, 1 = diag line, 2 = solid rect, 3 = alpharect QList<QSize> sizes; - sizes << QSize(1, 1) - << QSize(10, 10) - << QSize(100, 100) + sizes << QSize(10, 10) << QSize(1000, 1000); const char *typeNames[] = { @@ -658,7 +656,6 @@ void tst_QPainter::drawPixmapImage_data_helper(bool pixmaps) QImage::Format_RGB32, QImage::Format_ARGB32_Premultiplied, QImage::Format_RGB16, - QImage::Format_ARGB8565_Premultiplied, QImage::Format_BGR30, QImage::Format_Invalid }; @@ -683,12 +680,9 @@ void tst_QPainter::drawPixmapImage_data_helper(bool pixmaps) QImage::Format_ARGB32, QImage::Format_ARGB32_Premultiplied, QImage::Format_RGB16, - QImage::Format_ARGB8565_Premultiplied, QImage::Format_RGB888, QImage::Format_RGBX8888, QImage::Format_RGBA8888, - QImage::Format_RGBA8888_Premultiplied, - QImage::Format_A2BGR30_Premultiplied, QImage::Format_RGB30, QImage::Format_Grayscale8, QImage::Format_Invalid |