From ab5c8c476747a1a2492fb44400640082425523c1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Mon, 14 Mar 2011 12:46:53 +0100
Subject: [PATCH] Use Factory for GraphicsHardwareIntegration

---
 src/qt-compositor/dri2_xcb/dri2xcbhwintegration.cpp | 5 +++++
 src/qt-compositor/mesa_egl/mesaeglintegration.cpp   | 4 ++++
 src/qt-compositor/private/wlcompositor.cpp          | 6 +-----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/qt-compositor/dri2_xcb/dri2xcbhwintegration.cpp b/src/qt-compositor/dri2_xcb/dri2xcbhwintegration.cpp
index 21c0cd7..282f2f7 100644
--- a/src/qt-compositor/dri2_xcb/dri2xcbhwintegration.cpp
+++ b/src/qt-compositor/dri2_xcb/dri2xcbhwintegration.cpp
@@ -14,6 +14,11 @@
 #include <xcb/xcb.h>
 #include <xcb/dri2.h>
 
+GraphicsHardwareIntegration * GraphicsHardwareIntegration::createGraphicsHardwareIntegration(WaylandCompositor *compositor)
+{
+    return new Dri2XcbHWIntegration(compositor);
+}
+
 class DrmObject : public Wayland::Object<struct wl_object>
 {
 public:
diff --git a/src/qt-compositor/mesa_egl/mesaeglintegration.cpp b/src/qt-compositor/mesa_egl/mesaeglintegration.cpp
index f3d7d7a..4d3ae46 100644
--- a/src/qt-compositor/mesa_egl/mesaeglintegration.cpp
+++ b/src/qt-compositor/mesa_egl/mesaeglintegration.cpp
@@ -51,6 +51,10 @@
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
+GraphicsHardwareIntegration * GraphicsHardwareIntegration::createGraphicsHardwareIntegration(WaylandCompositor *compositor)
+{
+    return new MesaEglIntegration(compositor);
+}
 
 class MesaEglIntegrationPrivate
 {
diff --git a/src/qt-compositor/private/wlcompositor.cpp b/src/qt-compositor/private/wlcompositor.cpp
index 947b452..1e9aebe 100644
--- a/src/qt-compositor/private/wlcompositor.cpp
+++ b/src/qt-compositor/private/wlcompositor.cpp
@@ -178,11 +178,7 @@ Compositor::Compositor(WaylandCompositor *qt_compositor)
     , m_last_queued_buf(-1)
     , m_qt_compositor(qt_compositor)
 {
-#if defined(QT_COMPOSITOR_MESA_EGL)
-    m_graphics_hw_integration = new MesaEglIntegration(qt_compositor);
-#elif defined(QT_COMPOSITOR_DRI2_XCB)
-    m_graphics_hw_integration = new Dri2XcbHWIntegration(qt_compositor);
-#elif defined (QT_COMPOSITOR_WAYLAND_GL)
+#if defined (QT_COMPOSITOR_WAYLAND_GL)
     m_graphics_hw_integration = GraphicsHardwareIntegration::createGraphicsHardwareIntegration(qt_compositor);
 #endif
 
-- 
2.7.4