【Experimental】Enable Vulkan Renderer

qwlroots/src/render/qwrenderer.h

@@ -12,6 +12,9 @@ extern "C" {
 #include <wlr/render/pass.h>
 #undef static
 #include <wlr/util/box.h>
+#if WLR_HAVE_VULKAN_RENDERER
+#include <wlr/render/vulkan.h>
+#endif
 }
 
 struct wlr_renderer;
@@ -37,6 +40,14 @@ class QW_CLASS_OBJECT(renderer)
     QW_FUNC_MEMBER(renderer, init_wl_shm, bool, wl_display *wl_display)
     QW_FUNC_MEMBER(renderer, get_drm_fd, int)
     QW_FUNC_MEMBER(renderer, get_texture_formats, const wlr_drm_format_set *, uint32_t buffer_caps)
+#if WLR_HAVE_VULKAN_RENDERER
+    // Access the wlroots-adopted Vulkan device handles. Used by compositors
+    // (e.g. waylib) that adopt the wlroots VkDevice into Qt RHI.
+    QW_FUNC_MEMBER(vk_renderer, get_instance, VkInstance)
+    QW_FUNC_MEMBER(vk_renderer, get_physical_device, VkPhysicalDevice)
+    QW_FUNC_MEMBER(vk_renderer, get_device, VkDevice)
+    QW_FUNC_MEMBER(vk_renderer, get_queue_family, uint32_t)
+#endif
 
 protected:
     QW_FUNC_MEMBER(renderer, destroy, void)

qwlroots/src/render/qwtexture.h

@@ -7,6 +7,9 @@
 
 extern "C" {
 #include <wlr/render/wlr_texture.h>
+#if WLR_HAVE_VULKAN_RENDERER
+#include <wlr/render/vulkan.h>
+#endif
 }
 
 QW_BEGIN_NAMESPACE
@@ -17,6 +20,10 @@ class QW_CLASS_REINTERPRET_CAST(texture)
     QW_FUNC_STATIC(texture, from_pixels, qw_texture *, wlr_renderer *renderer, uint32_t fmt, uint32_t stride, uint32_t width, uint32_t height, const void *data)
     QW_FUNC_STATIC(texture, from_dmabuf, qw_texture *, wlr_renderer *renderer, wlr_dmabuf_attributes *attribs)
     QW_FUNC_STATIC(texture, from_buffer, qw_texture *, wlr_renderer *renderer, wlr_buffer *buffer)
+#if WLR_HAVE_VULKAN_RENDERER
+    QW_FUNC_MEMBER(vk_texture, get_image_attribs, void, wlr_vk_image_attribs *attribs)
+    QW_FUNC_MEMBER(vk_texture, has_alpha, bool)
+#endif
 
     QW_FUNC_MEMBER(texture, update_from_buffer, bool, wlr_buffer *buffer, const pixman_region32_t *damage)
 

src/core/qml/Animations/NewAnimation.qml

@@ -20,6 +20,7 @@ Item {
     required property var direction
     property int duration: 400 * Helper.animationSpeed
     property var enableBlur: false
+    property bool liveSource: direction === NewAnimation.Direction.Show
 
     x: target.x
     y: target.y
@@ -60,7 +61,7 @@ Item {
         width: root.target.width + 100
         height: root.target.height + 100
         anchors.centerIn: parent
-        live: direction === NewAnimation.Direction.Show
+        live: root.liveSource
         hideSource: true
         sourceItem: root.target
         sourceRect: Qt.rect(effect.x, effect.y, effect.width, effect.height)

src/core/qml/PrimaryOutput.qml

@@ -19,6 +19,9 @@ OutputItem {
         required property QtObject outputCursor
         readonly property point rawPosition: parent.mapFromGlobal(cursor.position.x, cursor.position.y)
         readonly property real effectiveScale: rootOutputItem.devicePixelRatio || 1.0
+        readonly property bool useCursorOutputLayer: GraphicsInfo.api !== GraphicsInfo.Vulkan
+                && GraphicsInfo.api !== GraphicsInfo.VulkanRhi
+                && !outputCursor.output.forceSoftwareCursor
 
         // Align cursor position to pixel grid to prevent blur on fractional DPR displays
         function alignToPixelGrid(value) {
@@ -35,7 +38,7 @@ OutputItem {
         x: position.x - hotSpot.x
         y: position.y - hotSpot.y
         visible: valid && outputCursor.visible
-        OutputLayer.enabled: !outputCursor.output.forceSoftwareCursor
+        OutputLayer.enabled: useCursorOutputLayer
         OutputLayer.keepLayer: true
         OutputLayer.outputs: [screenViewport]
         OutputLayer.flags: OutputLayer.Cursor

src/main.cpp

@@ -9,12 +9,13 @@
 #include <qwbuffer.h>
 #include <qwlogging.h>
 
 #include <DGuiApplicationHelper>
 #include <DLog>
 
+#include <QByteArray>
 #include <QGuiApplication>
 #include <QMetaType>
 #include <QPalette>
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
 #  include <private/qgenericunixtheme_p.h>
@@ -54,7 +55,15 @@
     });
     //    QQuickStyle::setStyle("Material");
 
-    QGuiApplication::setAttribute(Qt::AA_UseOpenGLES);
+    const QByteArray wlrRenderer = qgetenv("WLR_RENDERER");
+    const bool hasExplicitWlrRenderer = !wlrRenderer.isEmpty() && wlrRenderer != "auto";
+    if (wlrRenderer != "vulkan")
+        QGuiApplication::setAttribute(Qt::AA_UseOpenGLES);
+    if (hasExplicitWlrRenderer) {
+        WRenderHelper::setupRendererBackend();
+        if (wlrRenderer == "vulkan")
+            qunsetenv("QSG_RHI_BACKEND");
+    }
     QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
         Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
     QGuiApplication::setQuitOnLastWindowClosed(false);
@@ -77,7 +86,8 @@
 #endif
     DLogManager::registerJournalAppender();
 
-    WRenderHelper::setupRendererBackend();
+    if (!hasExplicitWlrRenderer)
+        WRenderHelper::setupRendererBackend();
     if (CmdLine::ref().tryExec())
         return 0;
     Q_ASSERT(qw_buffer::get_objects().isEmpty());

src/output/output.cpp

@@ -26,10 +26,12 @@
 #include <wxdgpopupsurface.h>
 #include <wxdgpopupsurfaceitem.h>
 
 #include <qwlayershellv1.h>
 #include <qwoutputlayout.h>
 
+#include <QQuickWindow>
 #include <QQmlEngine>
+#include <QSGRendererInterface>
 
 #include <algorithm>
 #include <optional>
@@ -38,14 +40,28 @@
 #define DIFF_APP_OFFSET_FACTOR 2.0
 #define POPUP_EDGE_MARGIN 10
 
+namespace {
+
+bool shouldForceSoftwareCursorForVulkanRhi()
+{
+    const auto graphicsApi = QQuickWindow::graphicsApi();
+    return qgetenv("WLR_RENDERER") == "vulkan"
+        && graphicsApi == QSGRendererInterface::Vulkan;
+}
+
+}
+
 Output *Output::create(WOutput *output, QQmlEngine *engine, QObject *parent)
 {
     auto isSoftwareCursor = [](WOutput *output) -> bool {
-        return output->handle()->is_x11() || Helper::instance()->globalConfig()->forceSoftwareCursor();
+        return output->handle()->is_x11()
+            || Helper::instance()->globalConfig()->forceSoftwareCursor()
+            || shouldForceSoftwareCursorForVulkanRhi();
     };
     QQmlComponent delegate(engine, "Treeland", "PrimaryOutput");
+    const bool forceSoftwareCursor = isSoftwareCursor(output);
     QObject *obj = delegate.beginCreate(engine->rootContext());
-    delegate.setInitialProperties(obj, { { "forceSoftwareCursor", isSoftwareCursor(output) } });
+    delegate.setInitialProperties(obj, { { "forceSoftwareCursor", forceSoftwareCursor } });
     delegate.completeCreate();
     WOutputItem *outputItem = qobject_cast<WOutputItem *>(obj);
     Q_ASSERT(outputItem);
@@ -54,6 +70,7 @@
     auto contentItem = Helper::instance()->window()->contentItem();
     outputItem->setParentItem(contentItem);
     outputItem->setOutput(output);
+    output->setForceSoftwareCursor(forceSoftwareCursor);
 
     connect(Helper::instance()->globalConfig(),
             &TreelandConfig::forceSoftwareCursorChanged,
@@ -62,6 +79,7 @@
                 auto forceSoftwareCursor = isSoftwareCursor(output);
                 qCInfo(lcTlOutput) << "forceSoftwareCursor changed to" << forceSoftwareCursor;
                 obj->setProperty("forceSoftwareCursor", forceSoftwareCursor);
+                output->setForceSoftwareCursor(forceSoftwareCursor);
             });
 
     auto o = new Output(outputItem, parent);

src/surface/surfacewrapper.cpp

@@ -25,6 +25,7 @@
 
 #include <qwbuffer.h>
 #include <qwlayershellv1.h>
+#include <qwrenderer.h>
 
 #include <QColor>
 #include <QVariant>
@@ -33,6 +34,21 @@
 #define CLOSE_ANIMATION 2
 #define ALWAYSONTOPLAYER 1
 
+namespace {
+bool isVulkanRendererBackend()
+{
+#ifdef ENABLE_VULKAN_RENDER
+    auto *helper = Helper::instance();
+    if (!helper || !helper->window() || !helper->window()->renderer())
+        return false;
+
+    return wlr_renderer_is_vk(helper->window()->renderer()->handle());
+#else
+    return false;
+#endif
+}
+}
+
 SurfaceWrapper::SurfaceWrapper(QmlEngine *qmlEngine,
                                WToplevelSurface *shellSurface,
                                Type type,
@@ -609,6 +625,7 @@ void SurfaceWrapper::startPrelaunchSplashHideSequence()
         const QRectF toGeometry(toTopLeft, targetImplicitSize);
         m_geometryAnimation =
             m_engine->createGeometryAnimation(this, fromGeometry, toGeometry, container());
+        Q_EMIT animationRunningChanged();
 
         bool ok = connect(m_geometryAnimation,
                           SIGNAL(ready()),
@@ -647,6 +664,7 @@ void SurfaceWrapper::onPrelaunchGeometryAnimationFinished()
     m_geometryAnimation->disconnect(this);
     m_geometryAnimation->deleteLater();
     m_geometryAnimation = nullptr;
+    Q_EMIT animationRunningChanged();
 
     if (m_decoration)
         m_decoration->setVisible(true);
@@ -1004,6 +1022,7 @@ void SurfaceWrapper::setSurfaceState(State newSurfaceState)
             m_geometryAnimation->disconnect(this);
             m_geometryAnimation->deleteLater();
             m_geometryAnimation = nullptr;
+            Q_EMIT animationRunningChanged();
         }
 
         doSetSurfaceState(newSurfaceState);
@@ -1270,6 +1289,8 @@ void SurfaceWrapper::createNewOrClose(uint direction)
     case Type::XWayland: {
         m_windowAnimation = m_engine->createNewAnimation(this, container(), direction);
         m_windowAnimation->setProperty("enableBlur", m_blur);
+        if (m_type == Type::SplashScreen && isVulkanRendererBackend())
+            m_windowAnimation->setProperty("liveSource", false);
     } break;
     case Type::Layer: {
         auto scope = QString(static_cast<WLayerSurfaceItem *>(m_surfaceItem)
@@ -1413,6 +1434,7 @@ void SurfaceWrapper::onAnimationReady()
         m_geometryAnimation->disconnect(this);
         m_geometryAnimation->deleteLater();
         m_geometryAnimation = nullptr;
+        Q_EMIT animationRunningChanged();
         return;
     }
 
@@ -1429,6 +1451,7 @@ void SurfaceWrapper::onAnimationFinished()
     m_geometryAnimation->disconnect(this);
     m_geometryAnimation->deleteLater();
     m_geometryAnimation = nullptr;
+    Q_EMIT animationRunningChanged();
 }
 
 bool SurfaceWrapper::startStateChangeAnimation(State targetState, const QRectF &targetGeometry)
@@ -1438,6 +1461,7 @@ bool SurfaceWrapper::startStateChangeAnimation(State targetState, const QRectF &
 
     m_geometryAnimation =
         m_engine->createGeometryAnimation(this, geometry(), targetGeometry, container());
+    Q_EMIT animationRunningChanged();
     m_geometryAnimation->setProperty("enableBlur", m_blur);
     m_pendingState = targetState;
     m_pendingGeometry = targetGeometry;

src/surface/surfacewrapper.h

@@ -77,6 +77,7 @@ class SurfaceWrapper : public QQuickItem
     // through treeland_dde_shell_surface_v1.set_surface_position
     Q_PROPERTY(QPoint clientRequstPos READ clientRequstPos NOTIFY clientRequstPosChanged FINAL)
     Q_PROPERTY(bool blur READ blur NOTIFY blurChanged FINAL)
+    Q_PROPERTY(bool isAnimationRunning READ isAnimationRunning NOTIFY animationRunningChanged FINAL)
     Q_PROPERTY(bool isWindowAnimationRunning READ isWindowAnimationRunning NOTIFY windowAnimationRunningChanged FINAL)
     Q_PROPERTY(bool coverEnabled READ coverEnabled NOTIFY coverEnabledChanged FINAL)
     Q_PROPERTY(bool acceptKeyboardFocus READ acceptKeyboardFocus NOTIFY acceptKeyboardFocusChanged FINAL)
@@ -350,6 +351,7 @@ public Q_SLOTS:
     void autoPlaceYOffsetChanged();
     void clientRequstPosChanged();
     void blurChanged();
+    void animationRunningChanged();
     void windowAnimationRunningChanged();
     void coverEnabledChanged();
     void aboutToBeInvalidated();

waylib/src/server/CMakeLists.txt

@@ -12,7 +12,7 @@ set(WAYLIB_INCLUDE_INSTALL_DIR
 if(Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
     find_package(Qt6 REQUIRED COMPONENTS GuiPrivate QuickPrivate)
 endif()
-find_package(Qt6 COMPONENTS Core Gui Quick REQUIRED)
+find_package(Qt6 COMPONENTS Core Gui Quick ShaderTools REQUIRED)
 
 qt_standard_project_setup(REQUIRES 6.8)