summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2011-12-07 10:16:20 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-08 10:10:27 +0100
commitfdd14a1a10a0a2f42015b30071771bd95215cc1a (patch)
tree1e79b74017df70e7f4b034dd4460406041507636 /tools
parent9128eb13040c57872e226222c9a45cad9946ed1a (diff)
Implemented multiple windows and GL context sharing
What was traditionally the QQuickRenderLoop which was used to support one QQuickCanvas instance has now grown to support multiple QQuickCanvas instances and is now called QQuickWindowManager, of which there are two implementations. QQuickRenderThreadSingleContextWindowManager: One QSGContext and one OpenGL context is being used to draw all the windows and we alternate between which surface the gl context is bound to. This implementation relies on that swap does not block, but that the graphics pipeline is vsynced and will eventually block as the buffer queue is filled up. This is the behavior we get on Mac OS X and Wayland. The benefit of this implementation is that we have vsync'ed animations, and the synchronizaiton between GUI and render thread is simple. (well, simple relative to the alternative, that is). QQuickTrivialWindowManager: One QSGContext and one OpenGL context is being used on the GUI thread. Animations are ticked from a timer. Performance of this implementation will deteriorate if the driver is using blocking swap. Task-number: QTBUG-19455 Change-Id: Ib961ac7d71eb49c70a057872b7cac020c4d19f3d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlscene/main.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 6cefc8a5de..a9a03aac6c 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -159,7 +159,6 @@ struct Options
bool scenegraphOnGraphicsview;
bool clip;
bool versionDetection;
- bool vsync;
};
#if defined(QMLSCENE_BUNDLE)
@@ -364,8 +363,6 @@ int main(int argc, char ** argv)
options.versionDetection = false;
else if (lowerArgument == QLatin1String("-i") && i + 1 < argc)
imports.append(QString::fromLatin1(argv[++i]));
- else if (lowerArgument == QLatin1String("--no-vsync-animations"))
- options.vsync = false;
else if (lowerArgument == QLatin1String("--help")
|| lowerArgument == QLatin1String("-help")
|| lowerArgument == QLatin1String("--h")
@@ -395,7 +392,6 @@ int main(int argc, char ** argv)
if (options.versionDetection)
checkAndAdaptVersion(options.file);
QQuickView *qxView = new MyQQuickView();
- qxView->setVSyncAnimations(options.vsync);
engine = qxView->engine();
for (int i = 0; i < imports.size(); ++i)
engine->addImportPath(imports.at(i));