diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2012-02-29 16:15:49 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@nokia.com> | 2012-03-01 17:35:21 +0100 |
| commit | 6d3f23feb9b1ca1392d018702b62387d773a7be4 (patch) | |
| tree | 261bfd20dae3c45e581a9bd48d8425d860a64774 /src/compositor/hardware_integration | |
| parent | 36818145a95924712adfcb2d0f72d914e80596f3 (diff) | |
Make SurfaceBuffer a QPlatformScreenBuffer
And refactor to make it fit
Done with: Paul
Change-Id: I2bd28abb4ac256a336cd6c2c90e67104d8c27cc5
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
Diffstat (limited to 'src/compositor/hardware_integration')
3 files changed, 3 insertions, 10 deletions
diff --git a/src/compositor/hardware_integration/graphicshardwareintegration.h b/src/compositor/hardware_integration/graphicshardwareintegration.h index cad28822e..bc1ec4223 100644 --- a/src/compositor/hardware_integration/graphicshardwareintegration.h +++ b/src/compositor/hardware_integration/graphicshardwareintegration.h @@ -63,7 +63,8 @@ public: virtual bool isYInverted(struct wl_buffer *) const { return true; } virtual bool setDirectRenderSurface(WaylandSurface *) {return false;} - virtual bool postBuffer(struct wl_buffer *) {return false;} + + virtual void *toNativeBufferHandle(struct wl_buffer *) { return 0; } static GraphicsHardwareIntegration *createGraphicsHardwareIntegration(WaylandCompositor *compositor); diff --git a/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp b/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp index 1d7d2e682..f8dfa398a 100644 --- a/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp +++ b/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp @@ -219,11 +219,3 @@ bool WaylandEglIntegration::setDirectRenderSurface(WaylandSurface *surface) return flipper; } - -bool WaylandEglIntegration::postBuffer(struct wl_buffer *buffer) -{ - QPlatformScreen *screen = QPlatformScreen::platformScreenForWindow(m_compositor->window()); - QPlatformScreenPageFlipper *flipper = screen->pageFlipper(); - - return flipper ? flipper->displayBuffer(buffer) : false; -} diff --git a/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.h b/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.h index 0f78e1d59..77f728180 100644 --- a/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.h +++ b/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.h @@ -58,7 +58,6 @@ public: bool isYInverted(struct wl_buffer *) const; bool setDirectRenderSurface(WaylandSurface *); - bool postBuffer(struct wl_buffer *); private: Q_DISABLE_COPY(WaylandEglIntegration) @@ -66,3 +65,4 @@ private: }; #endif // WAYLANDEGLINTEGRATION_H + |