Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: If09bb13aa7a0aadd5cfb8265166d3b9d1b22e2f1

2 files changed, 24 insertions, 6 deletions

diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index 471018ebd..ae0d793d3 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -366,8 +366,6 @@ void QWaylandCompositorPrivate::initializeHardwareIntegration()
     loadClientBufferIntegration();
     loadServerBufferIntegration();
 
-    if (client_buffer_integration)
-        client_buffer_integration->initializeHardware(display);
     if (server_buffer_integration)
         server_buffer_integration->initializeHardware(q);
 #endif
@@ -399,12 +397,32 @@ void QWaylandCompositorPrivate::loadClientBufferIntegration()
     if (!targetKey.isEmpty()) {
         client_buffer_integration.reset(QtWayland::ClientBufferIntegrationFactory::create(targetKey, QStringList()));
         if (client_buffer_integration) {
+            qCDebug(qLcWaylandCompositorHardwareIntegration) << "Loaded client buffer integration:" << targetKey;
             client_buffer_integration->setCompositor(q);
-            if (hw_integration)
-                hw_integration->setClientBufferIntegration(targetKey);
+            if (!client_buffer_integration->initializeHardware(display)) {
+                qCWarning(qLcWaylandCompositorHardwareIntegration)
+                        << "Failed to initialize hardware for client buffer integration:" << targetKey;
+                client_buffer_integration.reset();
+            }
+        } else {
+            qCWarning(qLcWaylandCompositorHardwareIntegration)
+                    << "Failed to load client buffer integration:" << targetKey;
         }
     }
-    //BUG: if there is no client buffer integration, bad things will happen when opengl is used
+
+    if (!client_buffer_integration) {
+        qCWarning(qLcWaylandCompositorHardwareIntegration)
+                << "No client buffer integration was loaded, this means that clients will fall back"
+                << "to use CPU buffers (wl_shm) for transmitting buffers instead of using zero-copy"
+                << "GPU buffer handles. Expect serious performance impact with OpenGL clients due"
+                << "to potentially multiple copies between CPU and GPU memory per buffer.\n"
+                << "See the QtWayland readme for more info about how to build and configure Qt for"
+                << "your device.";
+        return;
+    }
+
+    if (client_buffer_integration && hw_integration)
+        hw_integration->setClientBufferIntegration(targetKey);
 #endif
 }
 
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
index 0195f3d4b..2e962273f 100644
--- a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
+++ b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h
@@ -64,7 +64,7 @@ public:
     void setCompositor(QWaylandCompositor *compositor) { m_compositor = compositor; }
     QWaylandCompositor *compositor() const { return m_compositor; }
 
-    virtual void initializeHardware(struct ::wl_display *display) = 0;
+    virtual bool initializeHardware(struct ::wl_display *display) = 0;
 
     virtual ClientBuffer *createBufferFor(struct ::wl_resource *buffer) = 0;