Remove unused class QPaintBuffer
The class hasn't been used for a while anymore. Since it's private, simply remove it from QtGui. Change-Id: Ia0911d1c8b8836d963a51c8e354c96bc1ee4093f Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
This commit is contained in:
Lars Knoll
Lars Knoll
parent
ed8dbe6493
commit
bcf6a3eb34
@ -46,7 +46,6 @@ HEADERS += \
|
||||
painting/qtextureglyphcache_p.h \
|
||||
painting/qtransform.h \
|
||||
painting/qplatformbackingstore.h \
|
||||
painting/qpaintbuffer_p.h \
|
||||
painting/qpathsimplifier_p.h
|
||||
|
||||
|
||||
@ -89,7 +88,6 @@ SOURCES += \
|
||||
painting/qtextureglyphcache.cpp \
|
||||
painting/qtransform.cpp \
|
||||
painting/qplatformbackingstore.cpp \
|
||||
painting/qpaintbuffer.cpp \
|
||||
painting/qpathsimplifier.cpp
|
||||
|
||||
SSE2_SOURCES += painting/qdrawhelper_sse2.cpp
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,418 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the QtGui module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL21$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 or version 3 as published by the Free
|
||||
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
** following information to ensure the GNU Lesser General Public License
|
||||
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QPAINTBUFFER_P_H
|
||||
#define QPAINTBUFFER_P_H
|
||||
|
||||
//
|
||||
// W A R N I N G
|
||||
// -------------
|
||||
//
|
||||
// This file is not part of the Qt API. It exists purely as an
|
||||
// implementation detail. This header file may change from version to
|
||||
// version without notice, or even be removed.
|
||||
//
|
||||
// We mean it.
|
||||
//
|
||||
|
||||
#include <qpaintdevice.h>
|
||||
|
||||
#include <private/qpaintengineex_p.h>
|
||||
#include <private/qtextengine_p.h>
|
||||
#include <QDebug>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QPaintBufferPrivate;
|
||||
class QPaintBufferPlayback;
|
||||
|
||||
class Q_GUI_EXPORT QPaintBuffer : public QPaintDevice
|
||||
{
|
||||
Q_DECLARE_PRIVATE(QPaintBuffer)
|
||||
public:
|
||||
QPaintBuffer();
|
||||
QPaintBuffer(const QPaintBuffer &other);
|
||||
~QPaintBuffer();
|
||||
|
||||
bool isEmpty() const;
|
||||
|
||||
void beginNewFrame();
|
||||
int numFrames() const;
|
||||
|
||||
void draw(QPainter *painter, int frame = 0) const;
|
||||
|
||||
int frameStartIndex(int frame) const;
|
||||
int frameEndIndex(int frame) const;
|
||||
int processCommands(QPainter *painter, int begin, int end) const;
|
||||
#ifndef QT_NO_DEBUG_STREAM
|
||||
QString commandDescription(int command) const;
|
||||
#endif
|
||||
|
||||
void setBoundingRect(const QRectF &rect);
|
||||
QRectF boundingRect() const;
|
||||
|
||||
virtual QPaintEngine *paintEngine() const;
|
||||
virtual int metric(PaintDeviceMetric m) const;
|
||||
virtual int devType() const;
|
||||
|
||||
QPaintBuffer &operator=(const QPaintBuffer &other);
|
||||
|
||||
private:
|
||||
friend class QPainterReplayer;
|
||||
friend class QOpenGLReplayer;
|
||||
|
||||
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &stream, const QPaintBuffer &buffer);
|
||||
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QPaintBuffer &buffer);
|
||||
|
||||
QPaintBufferPrivate *d_ptr;
|
||||
};
|
||||
|
||||
Q_GUI_EXPORT QDataStream &operator<<(QDataStream &stream, const QPaintBuffer &buffer);
|
||||
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QPaintBuffer &buffer);
|
||||
|
||||
class QPaintBufferEngine;
|
||||
|
||||
class QTextItemIntCopy
|
||||
{
|
||||
public:
|
||||
QTextItemIntCopy(const QTextItem &item);
|
||||
~QTextItemIntCopy();
|
||||
QTextItemInt &operator () () {return m_item;}
|
||||
private:
|
||||
QTextItemInt m_item;
|
||||
QFont m_font;
|
||||
};
|
||||
|
||||
struct QPaintBufferCommand
|
||||
{
|
||||
uint id : 8;
|
||||
uint size : 24;
|
||||
|
||||
int offset;
|
||||
int offset2;
|
||||
int extra;
|
||||
};
|
||||
|
||||
QDataStream &operator<<(QDataStream &stream, const QPaintBufferCommand &command);
|
||||
QDataStream &operator>>(QDataStream &stream, QPaintBufferCommand &command);
|
||||
|
||||
Q_DECLARE_TYPEINFO(QPaintBufferCommand, Q_MOVABLE_TYPE);
|
||||
|
||||
class QPaintBufferPrivate
|
||||
{
|
||||
public:
|
||||
enum Command {
|
||||
Cmd_Save,
|
||||
Cmd_Restore,
|
||||
|
||||
Cmd_SetBrush,
|
||||
Cmd_SetBrushOrigin,
|
||||
Cmd_SetClipEnabled,
|
||||
Cmd_SetCompositionMode,
|
||||
Cmd_SetOpacity,
|
||||
Cmd_SetPen,
|
||||
Cmd_SetRenderHints,
|
||||
Cmd_SetTransform,
|
||||
Cmd_SetBackgroundMode,
|
||||
|
||||
Cmd_ClipPath,
|
||||
Cmd_ClipRect,
|
||||
Cmd_ClipRegion,
|
||||
Cmd_ClipVectorPath,
|
||||
|
||||
Cmd_DrawVectorPath,
|
||||
Cmd_FillVectorPath,
|
||||
Cmd_StrokeVectorPath,
|
||||
|
||||
Cmd_DrawConvexPolygonF,
|
||||
Cmd_DrawConvexPolygonI,
|
||||
Cmd_DrawEllipseF,
|
||||
Cmd_DrawEllipseI,
|
||||
Cmd_DrawLineF,
|
||||
Cmd_DrawLineI,
|
||||
Cmd_DrawPath,
|
||||
Cmd_DrawPointsF,
|
||||
Cmd_DrawPointsI,
|
||||
Cmd_DrawPolygonF,
|
||||
Cmd_DrawPolygonI,
|
||||
Cmd_DrawPolylineF,
|
||||
Cmd_DrawPolylineI,
|
||||
Cmd_DrawRectF,
|
||||
Cmd_DrawRectI,
|
||||
|
||||
Cmd_FillRectBrush,
|
||||
Cmd_FillRectColor,
|
||||
|
||||
Cmd_DrawText,
|
||||
Cmd_DrawTextItem,
|
||||
|
||||
Cmd_DrawImagePos,
|
||||
Cmd_DrawImageRect,
|
||||
Cmd_DrawPixmapPos,
|
||||
Cmd_DrawPixmapRect,
|
||||
Cmd_DrawTiledPixmap,
|
||||
|
||||
Cmd_SystemStateChanged,
|
||||
Cmd_Translate,
|
||||
Cmd_DrawStaticText,
|
||||
|
||||
// new commands must be added above this line
|
||||
|
||||
Cmd_LastCommand
|
||||
};
|
||||
|
||||
QPaintBufferPrivate();
|
||||
~QPaintBufferPrivate();
|
||||
|
||||
int addData(const int *data, int count) {
|
||||
if (count <= 0)
|
||||
return 0;
|
||||
int pos = ints.size();
|
||||
ints.resize(pos + count);
|
||||
memcpy(ints.data() + pos, data, count * sizeof(int));
|
||||
return pos;
|
||||
}
|
||||
|
||||
int addData(const qreal *data, int count) {
|
||||
if (count <= 0)
|
||||
return 0;
|
||||
int pos = floats.size();
|
||||
floats.resize(pos + count);
|
||||
memcpy(floats.data() + pos, data, count * sizeof(qreal));
|
||||
return pos;
|
||||
}
|
||||
|
||||
int addData(const QVariant &var) {
|
||||
variants << var;
|
||||
return variants.size() - 1;
|
||||
}
|
||||
|
||||
QPaintBufferCommand *addCommand(Command command) {
|
||||
QPaintBufferCommand cmd;
|
||||
cmd.id = command;
|
||||
cmd.size = cmd.offset = cmd.offset2 = cmd.extra = 0;
|
||||
commands << cmd;
|
||||
return &commands.last();
|
||||
}
|
||||
|
||||
QPaintBufferCommand *addCommand(Command command, const QVariant &var) {
|
||||
QPaintBufferCommand cmd;
|
||||
cmd.id = command;
|
||||
cmd.offset = addData(var);
|
||||
cmd.size = cmd.offset2 = cmd.extra = 0;
|
||||
commands << cmd;
|
||||
return &commands.last();
|
||||
}
|
||||
|
||||
QPaintBufferCommand *addCommand(Command command, const QVectorPath &path) {
|
||||
QPaintBufferCommand cmd;
|
||||
cmd.id = command;
|
||||
cmd.offset = addData(path.points(), path.elementCount() * 2);
|
||||
cmd.offset2 = ints.size();
|
||||
ints << path.hints();
|
||||
// The absence of path elements is indicated by setting the highest bit in 'cmd.offset2'.
|
||||
if (path.elements())
|
||||
addData((const int *) path.elements(), path.elementCount());
|
||||
else
|
||||
cmd.offset2 |= 0x80000000;
|
||||
cmd.size = path.elementCount();
|
||||
cmd.extra = 0;
|
||||
commands << cmd;
|
||||
return &commands.last();
|
||||
}
|
||||
|
||||
QPaintBufferCommand *addCommand(Command command , const qreal *pts, int arrayLength, int elementCount) {
|
||||
QPaintBufferCommand cmd;
|
||||
cmd.id = command;
|
||||
cmd.offset = addData(pts, arrayLength);
|
||||
cmd.size = elementCount;
|
||||
cmd.offset2 = cmd.extra = 0;
|
||||
commands << cmd;
|
||||
return &commands.last();
|
||||
}
|
||||
|
||||
QPaintBufferCommand *addCommand(Command command , const int *pts, int arrayLength, int elementCount) {
|
||||
QPaintBufferCommand cmd;
|
||||
cmd.id = command;
|
||||
cmd.offset = addData(pts, arrayLength);
|
||||
cmd.size = elementCount;
|
||||
cmd.offset2 = cmd.extra = 0;
|
||||
commands << cmd;
|
||||
return &commands.last();
|
||||
}
|
||||
|
||||
inline void updateBoundingRect(const QRectF &rect);
|
||||
|
||||
QAtomicInt ref;
|
||||
|
||||
QVector<int> ints;
|
||||
QVector<qreal> floats;
|
||||
QVector<QVariant> variants;
|
||||
|
||||
QVector<QPaintBufferCommand> commands;
|
||||
QList<int> frames;
|
||||
|
||||
QPaintBufferEngine *engine;
|
||||
QRectF boundingRect;
|
||||
qreal penWidthAdjustment;
|
||||
uint calculateBoundingRect : 1;
|
||||
|
||||
void *cache;
|
||||
};
|
||||
|
||||
|
||||
struct QVectorPathCmd
|
||||
{
|
||||
// The absence of path elements is indicated by setting the highest bit in 'cmd.offset2'.
|
||||
QVectorPathCmd(QPaintBufferPrivate *d, const QPaintBufferCommand &cmd)
|
||||
: vectorPath(d->floats.constData() + cmd.offset,
|
||||
cmd.size,
|
||||
cmd.offset2 & 0x80000000
|
||||
? 0
|
||||
: (const QPainterPath::ElementType *) (d->ints.constData() + cmd.offset2 + 1),
|
||||
*(d->ints.constData() + (cmd.offset2 & 0x7fffffff))) {}
|
||||
|
||||
inline const QVectorPath &operator()() const { return vectorPath; }
|
||||
|
||||
QVectorPath vectorPath;
|
||||
};
|
||||
|
||||
|
||||
class Q_GUI_EXPORT QPainterReplayer
|
||||
{
|
||||
public:
|
||||
QPainterReplayer() { }
|
||||
|
||||
virtual ~QPainterReplayer() { }
|
||||
|
||||
void setupTransform(QPainter *painter);
|
||||
virtual void process(const QPaintBufferCommand &cmd);
|
||||
void processCommands(const QPaintBuffer &buffer, QPainter *painter, int begin, int end);
|
||||
|
||||
protected:
|
||||
QPaintBufferPrivate *d;
|
||||
QTransform m_world_matrix;
|
||||
|
||||
QPainter *painter;
|
||||
};
|
||||
|
||||
class Q_GUI_EXPORT QPaintEngineExReplayer : public QPainterReplayer
|
||||
{
|
||||
public:
|
||||
QPaintEngineExReplayer() { }
|
||||
|
||||
virtual void process(const QPaintBufferCommand &cmd);
|
||||
};
|
||||
|
||||
class QPaintBufferEnginePrivate;
|
||||
|
||||
class QPaintBufferEngine : public QPaintEngineEx
|
||||
{
|
||||
Q_DECLARE_PRIVATE(QPaintBufferEngine)
|
||||
public:
|
||||
QPaintBufferEngine(QPaintBufferPrivate *buffer);
|
||||
|
||||
virtual bool begin(QPaintDevice *device);
|
||||
virtual bool end();
|
||||
|
||||
virtual Type type() const { return QPaintEngine::PaintBuffer; }
|
||||
|
||||
virtual QPainterState *createState(QPainterState *orig) const;
|
||||
|
||||
virtual void draw(const QVectorPath &path);
|
||||
virtual void fill(const QVectorPath &path, const QBrush &brush);
|
||||
virtual void stroke(const QVectorPath &path, const QPen &pen);
|
||||
|
||||
virtual void clip(const QVectorPath &path, Qt::ClipOperation op);
|
||||
virtual void clip(const QRect &rect, Qt::ClipOperation op);
|
||||
virtual void clip(const QRegion ®ion, Qt::ClipOperation op);
|
||||
virtual void clip(const QPainterPath &path, Qt::ClipOperation op);
|
||||
|
||||
virtual void clipEnabledChanged();
|
||||
virtual void penChanged();
|
||||
virtual void brushChanged();
|
||||
virtual void brushOriginChanged();
|
||||
virtual void opacityChanged();
|
||||
virtual void compositionModeChanged();
|
||||
virtual void renderHintsChanged();
|
||||
virtual void transformChanged();
|
||||
virtual void backgroundModeChanged();
|
||||
|
||||
virtual void fillRect(const QRectF &rect, const QBrush &brush);
|
||||
virtual void fillRect(const QRectF &rect, const QColor &color);
|
||||
|
||||
virtual void drawRects(const QRect *rects, int rectCount);
|
||||
virtual void drawRects(const QRectF *rects, int rectCount);
|
||||
|
||||
virtual void drawLines(const QLine *lines, int lineCount);
|
||||
virtual void drawLines(const QLineF *lines, int lineCount);
|
||||
|
||||
virtual void drawEllipse(const QRectF &r);
|
||||
virtual void drawEllipse(const QRect &r);
|
||||
|
||||
virtual void drawPath(const QPainterPath &path);
|
||||
|
||||
virtual void drawPoints(const QPointF *points, int pointCount);
|
||||
virtual void drawPoints(const QPoint *points, int pointCount);
|
||||
|
||||
virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
|
||||
virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode);
|
||||
|
||||
virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr);
|
||||
virtual void drawPixmap(const QPointF &pos, const QPixmap &pm);
|
||||
|
||||
virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr,
|
||||
Qt::ImageConversionFlags flags = Qt::AutoColor);
|
||||
virtual void drawImage(const QPointF &pos, const QImage &image);
|
||||
|
||||
virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s);
|
||||
|
||||
virtual void drawTextItem(const QPointF &pos, const QTextItem &ti);
|
||||
virtual void drawStaticTextItem(QStaticTextItem *staticTextItem);
|
||||
|
||||
virtual void setState(QPainterState *s);
|
||||
virtual uint flags() const {return QPaintEngineEx::DoNotEmulate;}
|
||||
|
||||
QPaintBufferPrivate *buffer;
|
||||
|
||||
mutable int m_begin_detected : 1;
|
||||
mutable int m_save_detected : 1;
|
||||
mutable int m_stream_raw_text_items : 1;
|
||||
mutable int m_unused : 29;
|
||||
|
||||
mutable QPainterState *m_created_state;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QPAINTBUFFER_P_H
|
||||
@ -3,7 +3,6 @@ SUBDIRS = \
|
||||
qpainter \
|
||||
qregion \
|
||||
qtransform \
|
||||
qtracebench \
|
||||
qtbench
|
||||
|
||||
!qtHaveModule(widgets): SUBDIRS -= \
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
QT += widgets testlib
|
||||
QT += core-private gui-private widgets-private
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = tst_qtracebench
|
||||
|
||||
RESOURCES += qtracebench.qrc
|
||||
|
||||
SOURCES += tst_qtracebench.cpp
|
||||
|
||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
||||
@ -1,10 +0,0 @@
|
||||
<RCC>
|
||||
<qresource>
|
||||
<file>traces/basicdrawing.trace</file>
|
||||
<file>traces/webkit.trace</file>
|
||||
<file>traces/textedit.trace</file>
|
||||
<file>traces/creator.trace</file>
|
||||
<file>traces/qmlphoneconcept.trace</file>
|
||||
<file>traces/qmlsamegame.trace</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,253 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the test suite of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL21$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 or version 3 as published by the Free
|
||||
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
** following information to ensure the GNU Lesser General Public License
|
||||
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <qtest.h>
|
||||
|
||||
#include <QtGui>
|
||||
|
||||
#include <private/qpaintengineex_p.h>
|
||||
#include <private/qpaintbuffer_p.h>
|
||||
|
||||
class ReplayWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
ReplayWidget(const QString &filename);
|
||||
|
||||
void paintEvent(QPaintEvent *event);
|
||||
void resizeEvent(QResizeEvent *event);
|
||||
|
||||
bool done() const { return m_done; }
|
||||
qreal result() const { return m_result; }
|
||||
|
||||
public slots:
|
||||
void updateRect();
|
||||
|
||||
public:
|
||||
QList<QRegion> updates;
|
||||
QPaintBuffer buffer;
|
||||
|
||||
int currentFrame;
|
||||
int currentIteration;
|
||||
QTime timer;
|
||||
|
||||
QList<uint> visibleUpdates;
|
||||
QList<uint> iterationTimes;
|
||||
QString filename;
|
||||
|
||||
bool m_done;
|
||||
qreal m_result;
|
||||
|
||||
uint m_total;
|
||||
};
|
||||
|
||||
void ReplayWidget::updateRect()
|
||||
{
|
||||
if (!visibleUpdates.isEmpty())
|
||||
update(updates.at(visibleUpdates.at(currentFrame)));
|
||||
}
|
||||
|
||||
void ReplayWidget::paintEvent(QPaintEvent *)
|
||||
{
|
||||
if (m_done)
|
||||
return;
|
||||
|
||||
QPainter p(this);
|
||||
|
||||
// if partial updates don't work
|
||||
// p.setClipRegion(frames.at(currentFrame).updateRegion);
|
||||
|
||||
buffer.draw(&p, visibleUpdates.at(currentFrame));
|
||||
|
||||
++currentFrame;
|
||||
if (currentFrame >= visibleUpdates.size()) {
|
||||
currentFrame = 0;
|
||||
++currentIteration;
|
||||
|
||||
uint currentElapsed = timer.isNull() ? 0 : timer.elapsed();
|
||||
timer.restart();
|
||||
|
||||
m_total += currentElapsed;
|
||||
|
||||
// warm up for at most 5 iterations or half a second
|
||||
if (currentIteration >= 5 || m_total >= 500) {
|
||||
iterationTimes << currentElapsed;
|
||||
|
||||
if (iterationTimes.size() >= 5) {
|
||||
qreal mean = 0;
|
||||
qreal stddev = 0;
|
||||
uint min = INT_MAX;
|
||||
|
||||
for (int i = 0; i < iterationTimes.size(); ++i) {
|
||||
mean += iterationTimes.at(i);
|
||||
min = qMin(min, iterationTimes.at(i));
|
||||
}
|
||||
|
||||
mean /= qreal(iterationTimes.size());
|
||||
|
||||
for (int i = 0; i < iterationTimes.size(); ++i) {
|
||||
qreal delta = iterationTimes.at(i) - mean;
|
||||
stddev += delta * delta;
|
||||
}
|
||||
|
||||
stddev = qSqrt(stddev / iterationTimes.size());
|
||||
|
||||
qSort(iterationTimes.begin(), iterationTimes.end());
|
||||
uint median = iterationTimes.at(iterationTimes.size() / 2);
|
||||
|
||||
stddev = 100 * stddev / mean;
|
||||
// do 100 iterations, break earlier if we spend more than 5 seconds or have a low std deviation after 2 seconds
|
||||
if (iterationTimes.size() >= 100 || m_total >= 5000 || (m_total >= 2000 && stddev < 4)) {
|
||||
printf("%s, iterations: %d, frames: %d, min(ms): %d, median(ms): %d, stddev: %f %%, max(fps): %f\n", qPrintable(filename),
|
||||
iterationTimes.size(), visibleUpdates.size(), min, median, stddev, 1000. * visibleUpdates.size() / min);
|
||||
m_result = min;
|
||||
m_done = true;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ReplayWidget::resizeEvent(QResizeEvent * /* event */)
|
||||
{
|
||||
visibleUpdates.clear();
|
||||
|
||||
QRect bounds = rect();
|
||||
for (int i = 0; i < updates.size(); ++i) {
|
||||
if (updates.at(i).intersects(bounds))
|
||||
visibleUpdates << i;
|
||||
}
|
||||
|
||||
if (visibleUpdates.size() != updates.size())
|
||||
printf("Warning: skipped %d frames due to limited resolution\n", updates.size() - visibleUpdates.size());
|
||||
|
||||
}
|
||||
|
||||
ReplayWidget::ReplayWidget(const QString &filename_)
|
||||
: currentFrame(0)
|
||||
, currentIteration(0)
|
||||
, filename(filename_)
|
||||
, m_done(false)
|
||||
, m_result(0)
|
||||
, m_total(0)
|
||||
{
|
||||
setWindowTitle(filename);
|
||||
QFile file(filename);
|
||||
|
||||
if (!file.open(QIODevice::ReadOnly)) {
|
||||
printf("Failed to load input file '%s'\n", qPrintable(filename_));
|
||||
return;
|
||||
}
|
||||
|
||||
QDataStream in(&file);
|
||||
in.setVersion(QDataStream::Qt_4_7);
|
||||
|
||||
char *data;
|
||||
uint size;
|
||||
in.readBytes(data, size);
|
||||
bool isTraceFile = size >= 7 && qstrncmp(data, "qttrace", 7) == 0;
|
||||
uint version = 0;
|
||||
if (size == 9 && qstrncmp(data, "qttraceV2", 9) == 0) {
|
||||
in.setFloatingPointPrecision(QDataStream::SinglePrecision);
|
||||
in >> version;
|
||||
}
|
||||
|
||||
delete [] data;
|
||||
if (!isTraceFile) {
|
||||
printf("File '%s' is not a trace file\n", qPrintable(filename_));
|
||||
return;
|
||||
}
|
||||
|
||||
in >> buffer >> updates;
|
||||
|
||||
resize(buffer.boundingRect().size().toSize());
|
||||
|
||||
setAutoFillBackground(false);
|
||||
setAttribute(Qt::WA_NoSystemBackground);
|
||||
}
|
||||
|
||||
|
||||
class tst_QTraceBench : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
private slots:
|
||||
void trace();
|
||||
void trace_data();
|
||||
};
|
||||
|
||||
static const QLatin1String prefix(":/traces/");
|
||||
|
||||
void tst_QTraceBench::trace_data()
|
||||
{
|
||||
QTest::addColumn<QString>("filename");
|
||||
|
||||
QTest::newRow("basicdrawing") << (prefix + "basicdrawing.trace");
|
||||
QTest::newRow("webkit") << (prefix + "webkit.trace");
|
||||
QTest::newRow("creator") << (prefix + "creator.trace");
|
||||
QTest::newRow("textedit") << (prefix + "textedit.trace");
|
||||
QTest::newRow("qmlphoneconcept") << (prefix + "qmlphoneconcept.trace");
|
||||
QTest::newRow("qmlsamegame") << (prefix + "qmlsamegame.trace");
|
||||
}
|
||||
|
||||
void tst_QTraceBench::trace()
|
||||
{
|
||||
QFETCH(QString, filename);
|
||||
|
||||
QFile file(filename);
|
||||
if (!file.exists()) {
|
||||
qWarning() << "Missing file" << filename;
|
||||
return;
|
||||
}
|
||||
|
||||
ReplayWidget widget(filename);
|
||||
|
||||
if (widget.updates.isEmpty()) {
|
||||
qWarning() << "No trace updates" << filename;
|
||||
return;
|
||||
}
|
||||
|
||||
widget.show();
|
||||
QTest::qWaitForWindowShown(&widget);
|
||||
|
||||
while (!widget.done()) {
|
||||
widget.updateRect();
|
||||
QApplication::processEvents();
|
||||
}
|
||||
|
||||
QTest::setBenchmarkResult(widget.result(), QTest::WalltimeMilliseconds);
|
||||
}
|
||||
|
||||
QTEST_MAIN(tst_QTraceBench)
|
||||
#include "tst_qtracebench.moc"
|
||||
Loading…
Reference in New Issue
Block a user