Add a factory function for creating GraphicsHardwareIntegration

We do it the simple way for now...

diff --git a/src/qt-compositor/graphicshardwareintegration.h b/src/qt-compositor/graphicshardwareintegration.h
index 08d6859..7e0e76c 100644 (file)
--- a/src/qt-compositor/graphicshardwareintegration.h
+++ b/src/qt-compositor/graphicshardwareintegration.h
@@ -59,6 +59,8 @@ public:
      **/
     virtual GLuint createTextureFromBuffer(struct wl_buffer *buffer) = 0;
 
+    static GraphicsHardwareIntegration *createGraphicsHardwareIntegration(WaylandCompositor *compositor);
+
 protected:
     WaylandCompositor *m_compositor;
 };

diff --git a/src/qt-compositor/private/wlcompositor.cpp b/src/qt-compositor/private/wlcompositor.cpp
index a4b6293..376f851 100644 (file)
--- a/src/qt-compositor/private/wlcompositor.cpp
+++ b/src/qt-compositor/private/wlcompositor.cpp
@@ -75,6 +75,8 @@
 #include "../dri2_xcb/dri2xcbhwintegration.h"
 #endif
 
+#include "graphicshardwareintegration.h"
+
 namespace Wayland {
 
 void input_device_attach(struct wl_client *client,
@@ -177,11 +179,12 @@ Compositor::Compositor(WaylandCompositor *qt_compositor)
     , m_last_queued_buf(-1)
     , m_qt_compositor(qt_compositor)
 {
-#ifdef QT_COMPOSITOR_MESA_EGL
+#if defined(QT_COMPOSITOR_MESA_EGL)
     m_graphics_hw_integration = new MesaEglIntegration(qt_compositor);
-#endif
-#ifdef QT_COMPOSITOR_DRI2_XCB
+#elif defined(QT_COMPOSITOR_DRI2_XCB)
     m_graphics_hw_integration = new Dri2XcbHWIntegration(qt_compositor);
+#else
+    m_graphics_hw_integration = GraphicsHardwareIntegration::createGraphicsHardwareIntegration(qt_compositor);
 #endif
 
     if (wl_compositor_init(base(), &compositor_interface, m_display->handle())) {