Port to rhi

qmlui/app.cpp

@@ -33,6 +33,7 @@
 #include <QPrinter>
 #include <QPainter>
 #include <QScreen>
+#include <QQmlFileSelector>
 #include <unistd.h>
 
 #include "app.h"
@@ -124,6 +125,11 @@ void App::startup()
     qmlRegisterType<ModelSelector>("org.qlcplus.classes", 1, 0, "ModelSelector");
     qmlRegisterType<FolderBrowser>("org.qlcplus.classes", 1, 0, "FolderBrowser");
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    QQmlFileSelector* selector = new QQmlFileSelector(engine());
+    selector->setExtraSelectors({"qt5"});
+#endif
+
     setTitle(APPNAME);
     setIcon(QIcon(":/qlcplus.svg"));
 
@@ -256,9 +262,14 @@ bool App::is3DSupported() const
     int glVersion = (openglContext()->format().majorVersion() * 10) + openglContext()->format().minorVersion();
     return glVersion < 33 ? false : true;
 #else
-    // TODO: Qt6
-
-    return true;
+    if (rendererInterface()->isApiRhiBased(graphicsApi())) {
+        return true;
+    }
+    QOpenGLContext * openglContext = static_cast<QOpenGLContext *>(rendererInterface()->getResource(const_cast<App *>(this), QSGRendererInterface::OpenGLContextResource));
+    if (openglContext && openglContext->isValid() && openglContext->format().majorVersion() * 10 + openglContext->format().minorVersion() >= 33) {
+        return true;
+    }
+    return false;
 #endif
 }
 

qmlui/inputprofileeditor.h

@@ -48,8 +48,7 @@ class InputProfileEditor : public QObject
      * Initialization
      ************************************************************************/
 public:
-    InputProfileEditor(QObject *parent = nullptr);
-    InputProfileEditor(QLCInputProfile *profile, Doc *doc, QObject *parent = nullptr);
+    explicit InputProfileEditor(QLCInputProfile *profile, Doc *doc, QObject *parent = nullptr);
     ~InputProfileEditor();
 
     /* Get/Set the profile modified state */

qmlui/mainview3d.cpp

@@ -380,9 +380,9 @@ void MainView3D::initialize3DProperties()
     QMetaObject::invokeMethod(m_scene3D, "updateFrameGraph", Q_ARG(QVariant, true));
 }
 
-QString MainView3D::makeShader(QString str) {
-
-   QString prefix = R"(#version 150
+QString MainView3D::makeGlShader(const QString &str)
+{
+    QString prefix = R"(#version 150
 #define GL3
 
 #ifdef GL3
@@ -416,6 +416,46 @@ QString MainView3D::makeShader(QString str) {
     return prefix + str;
 }
 
+QString MainView3D::makeRhiShader(const QString &str) {
+
+   QString prefix = R"(#version 450 core
+
+layout(std140, binding = 0) uniform qt3d_render_view_uniforms {
+  mat4 viewMatrix;
+  mat4 projectionMatrix;
+  mat4 uncorrectedProjectionMatrix;
+  mat4 clipCorrectionMatrix;
+  mat4 viewProjectionMatrix;
+  mat4 inverseViewMatrix;
+  mat4 inverseProjectionMatrix;
+  mat4 inverseViewProjectionMatrix;
+  mat4 viewportMatrix;
+  mat4 inverseViewportMatrix;
+  vec4 textureTransformMatrix;
+  vec3 eyePosition;
+  float aspectRatio;
+  float gamma;
+  float exposure;
+  float time;
+  float yUpInNDC;
+  float yUpInFBO;
+};
+
+layout(std140, binding = 1) uniform qt3d_command_uniforms {
+  mat4 modelMatrix;
+  mat4 inverseModelMatrix;
+  mat4 modelViewMatrix;
+  mat3 modelNormalMatrix;
+  mat4 inverseModelViewMatrix;
+  mat4 modelViewProjection;
+  mat4 inverseModelViewProjectionMatrix;
+};
+
+)";
+
+    return prefix + str;
+}
+
 void MainView3D::sceneReady()
 {
     qDebug() << "Scene entity ready";

qmlui/mainview3d.h

@@ -195,7 +195,9 @@ protected slots:
 
     Q_INVOKABLE void initializeFixture(quint32 itemID, QEntity *fxEntity, QSceneLoader *loader);
 
-    Q_INVOKABLE QString makeShader(QString str);
+    Q_INVOKABLE QString makeGlShader(const QString &str);
+
+    Q_INVOKABLE QString makeRhiShader(const QString &str);
 
     /** Update the fixture preview items when some channels have changed */
     void updateFixture(Fixture *fixture, QByteArray &previous);