qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Port paintbenchmark to QOpenGLWidget 

QGLWidget is gone.

Change-Id: Ief5d1edeff96afa739b58acbb3d83779f78d7838
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Ulf Hermann 2020-01-08 17:18:34 +01:00
parent 0b9fcb8293
commit 1d964d5485
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/benchmarks/qml/painting/paintbenchmark.cpp
View File

@ -31,7 +31,7 @@
#include <QImage> #include <QImage>
#include <QPainter> #include <QPainter>
#include <QPainterPath> #include <QPainterPath>
#include <QGLWidget> #include <QOpenGLWidget>
#include <QTextLayout> #include <QTextLayout>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QElapsedTimer> #include <QElapsedTimer>
@ -46,7 +46,7 @@ const int spacing = 36;
QSizeF size(1000, 800); QSizeF size(1000, 800);
const qreal lineWidth = 1000; const qreal lineWidth = 1000;
QString strings[lines]; QString strings[lines];
QGLWidget *testWidget = 0; QOpenGLWidget *testWidget = 0;
void paint_QTextLayout(QPainter &p, bool useCache) void paint_QTextLayout(QPainter &p, bool useCache)
{ {
@ -151,8 +151,8 @@ void paint_RoundedRect(QPainter &p)
static bool first = true; static bool first = true;
if (first) { if (first) {
if (testWidget) { if (testWidget) {
QGLFormat format = testWidget->format(); QSurfaceFormat format = testWidget->format();
if (!format.sampleBuffers()) if (format.samples() == -1)
qWarning() << "Cannot paint antialiased rounded rect without sampleBuffers"; qWarning() << "Cannot paint antialiased rounded rect without sampleBuffers";
} }
first = false; first = false;
@ -314,10 +314,11 @@ struct {
PaintFunc testFunc = 0; PaintFunc testFunc = 0;
class MyGLWidget : public QGLWidget class MyGLWidget : public QOpenGLWidget
{ {
public: public:
MyGLWidget(const QGLFormat &format) : QGLWidget(format), frames(0) { MyGLWidget(const QSurfaceFormat &format) : frames(0) {
setFormat(format);
const char chars[] = "abcd efgh ijkl mnop qrst uvwx yz!$. ABCD 1234"; const char chars[] = "abcd efgh ijkl mnop qrst uvwx yz!$. ABCD 1234";
int len = strlen(chars); int len = strlen(chars);
for (int i = 0; i < lines; ++i) { for (int i = 0; i < lines; ++i) {
@ -394,8 +395,11 @@ int main(int argc, char *argv[])
} }
QWidget w; QWidget w;
QGLFormat format = QGLFormat::defaultFormat(); QSurfaceFormat format = QSurfaceFormat::defaultFormat();
format.setSampleBuffers(sampleBuffers); if (!sampleBuffers)
format.setSamples(-1);
else if (format.samples() == -1)
format.setSamples(4);
testWidget = new MyGLWidget(format); testWidget = new MyGLWidget(format);
testWidget->setAutoFillBackground(false); testWidget->setAutoFillBackground(false);
QVBoxLayout *layout = new QVBoxLayout(&w); QVBoxLayout *layout = new QVBoxLayout(&w);