1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multiwindow: Base vsync debug output on actual surface format

Browse Source 
Allows us to detect cases where the requested vsync combination was
not possible to fulfill.

Change-Id: Ie8f3665129f7a1ab7fcefb94b2298d54520b753a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Tor Arne Vestbø 2016-08-25 15:04:54 +02:00 committed by Tor Arne Vestbø
parent efdecff085
commit fecee98836
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/manual/qopenglwindow/multiwindow/main.cpp
View File

@ -88,6 +88,18 @@ public slots:
} }
protected: protected:
void exposeEvent(QExposeEvent *event) {
if (!isExposed())
return;
QSurfaceFormat format = context()->format();
qDebug() << this << format.swapBehavior() << "with Vsync =" << (format.swapInterval() ? "ON" : "OFF");
if (format.swapInterval() != requestedFormat().swapInterval())
qWarning() << "WARNING: Did not get requested swap interval of" << requestedFormat().swapInterval() << "for" << this;
QOpenGLWindow::exposeEvent(event);
}
void mousePressEvent(QMouseEvent *event) { void mousePressEvent(QMouseEvent *event) {
qDebug() << this << event; qDebug() << this << event;
color.setHsl((color.hue() + 90) % 360, color.saturation(), color.lightness()); color.setHsl((color.hue() + 90) % 360, color.saturation(), color.lightness());
@ -158,14 +170,9 @@ int main(int argc, char **argv)
parser.process(app); parser.process(app);
QSurfaceFormat fmt; QSurfaceFormat defaultSurfaceFormat;
if (parser.isSet(noVsyncOption)) { defaultSurfaceFormat.setSwapInterval(parser.isSet(noVsyncOption) ? 0 : 1);
qDebug("swap interval 0 (no throttling)"); QSurfaceFormat::setDefaultFormat(defaultSurfaceFormat);
fmt.setSwapInterval(0);
} else {
qDebug("swap interval 1 (sync to vblank)");
}
QSurfaceFormat::setDefaultFormat(fmt);
QRect availableGeometry = app.primaryScreen()->availableGeometry(); QRect availableGeometry = app.primaryScreen()->availableGeometry();
@ -176,12 +183,11 @@ int main(int argc, char **argv)
windows << w; windows << w;
if (i == 0 && parser.isSet(vsyncOneOption)) { if (i == 0 && parser.isSet(vsyncOneOption)) {
qDebug("swap interval 1 for first window only"); QSurfaceFormat vsyncedSurfaceFormat = defaultSurfaceFormat;
QSurfaceFormat vsyncedSurfaceFormat = fmt;
vsyncedSurfaceFormat.setSwapInterval(1); vsyncedSurfaceFormat.setSwapInterval(1);
w->setFormat(vsyncedSurfaceFormat); w->setFormat(vsyncedSurfaceFormat);
fmt.setSwapInterval(0); defaultSurfaceFormat.setSwapInterval(0);
QSurfaceFormat::setDefaultFormat(fmt); QSurfaceFormat::setDefaultFormat(defaultSurfaceFormat);
} }
static int windowWidth = w->width() + 20; static int windowWidth = w->width() + 20;