Merge a76c921 into b3d084c

RedisInsight · Feb 23, 2018 · 3313d68 · 3313d68
2 parents b3d084c + a76c921
commit 3313d68
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 14 deletions.
diff --git a/build/windows/installer/resources/opengl32sw.dll b/build/windows/installer/resources/opengl32sw.dll
diff --git a/src/app/app.cpp b/src/app/app.cpp
@@ -6,6 +6,7 @@
 #include <QQmlContext>
 #include <QSettings>
 #include <QMessageBox>
+#include <QQuickWindow>
 #include <easylogging++.h>
 #include <qredisclient/redisclient.h>
 
@@ -38,6 +39,7 @@ Application::Application(int &argc, char **argv)
     // Init components required for models and qml
     initLog();
     initAppInfo();
+    processCmdArgs();
     initAppFonts();    
     initRedisClient();
     initUpdater();    
@@ -121,10 +123,34 @@ void Application::registerQmlRootObjects()
 }
 
 void Application::initQml()
-{       
+{             
+    if (m_renderingBackend == "auto") {
+        #ifdef Q_OS_WIN
+        // Experimental
+        // Use DirectX 12 on Windows 10
+        if (QSysInfo::productVersion() == "10") {
+            QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Direct3D12);
+        } else {
+            // Use software renderer on older versions
+            QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
+        }
+        #endif
+    } else {
+        QQuickWindow::setSceneGraphBackend(m_renderingBackend);
+    }
+
     registerQmlTypes();
     registerQmlRootObjects();
-    m_engine.load(QUrl(QStringLiteral("qrc:///app.qml")));
+
+    try {
+        m_engine.load(QUrl(QStringLiteral("qrc:///app.qml")));
+    } catch (...) {
+        qDebug() << "Failed to load app window. Retrying with software renderer...";
+        QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
+        m_engine.load(QUrl(QStringLiteral("qrc:///app.qml")));
+    }
+
+    qDebug() << "Rendering backend:" << QQuickWindow::sceneGraphBackend();
 }
 
 void Application::initLog()
@@ -148,19 +174,8 @@ void Application::initLog()
 
 void Application::initConnectionsManager()
 {
-    // Parse optional arguments first
-    QCommandLineParser parser;
-    QCommandLineOption settingsDir(
-            "settings-dir",            
-             "(Optional) Directory where RDM looks/saves .rdm directory with connections.json file",
-             "settingsDir",
-             QDir::homePath()
-    );
-    parser.addOption(settingsDir);
-    parser.process(*this);
-
     //connection manager
-    ConfigManager confManager(parser.value(settingsDir));
+    ConfigManager confManager(m_settingsDir);
     if (confManager.migrateOldConfig("connections.xml", "connections.json")) {
         LOG(INFO) << "Migrate connections.xml to connections.json";
     }
@@ -236,6 +251,31 @@ void Application::installTranslator()
     }
 }
 
+void Application::processCmdArgs()
+{
+    QCommandLineParser parser;    
+    QCommandLineOption settingsDir(
+            "settings-dir",
+             "(Optional) Directory where RDM looks/saves .rdm directory with connections.json file",
+             "settingsDir",
+             QDir::homePath()
+    );
+    QCommandLineOption renderingBackend(
+            "rendering-backend",
+             "(Optional) QML rendering backend [software|opengl|d3d12|'']",
+             "renderingBackend",
+             "auto"
+    );
+    parser.addHelpOption();
+    parser.addVersionOption();
+    parser.addOption(settingsDir);
+    parser.addOption(renderingBackend);
+    parser.process(*this);
+
+    m_settingsDir = parser.value(settingsDir);
+    m_renderingBackend = parser.value(renderingBackend);
+}
+
 void Application::OnNewUpdateAvailable(QString &url)
 {
     QMessageBox::information(nullptr, "New update available",

diff --git a/src/app/app.h b/src/app/app.h
@@ -37,6 +37,7 @@ class Application : public QApplication
     void initConnectionsManager();
     void initUpdater();
     void installTranslator();
+    void processCmdArgs();
 
 private slots:
       void OnNewUpdateAvailable(QString &url);
@@ -52,4 +53,6 @@ private slots:
     QSharedPointer<TabViewModel> m_consoleModel;
     QSharedPointer<TabViewModel> m_serverStatsModel;
     LogHandler* m_logger;
+    QString m_settingsDir;
+    QString m_renderingBackend;
 };