diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-01-18 19:52:22 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-21 15:17:34 +0100 |
| commit | 76d2f1e8ef87f998444ec0a6e3c68c77525cff19 (patch) | |
| tree | 254ae9d733f3a91b6e76f0b14c104443609bfa3d /src/hardwareintegration | |
| parent | 36ff0f303b79dcd7aae93d5a73dfc1f179ac5560 (diff) | |
| download | qtwayland-76d2f1e8ef87f998444ec0a6e3c68c77525cff19.tar.gz | |
Removed directrender/pageflipper codepaths.
Change-Id: I770b79eb21fbc4ac7826cec5c47286dab6c74da5
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/hardwareintegration')
| -rw-r--r-- | src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp | 16 | ||||
| -rw-r--r-- | src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h | 2 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp index 7cc140cd..c9b8c9e4 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp @@ -79,7 +79,6 @@ public: : egl_display(EGL_NO_DISPLAY) , valid(false) , display_bound(false) - , flipperConnected(false) , egl_bind_wayland_display(0) , egl_unbind_wayland_display(0) , egl_query_wayland_buffer(0) @@ -90,7 +89,6 @@ public: EGLDisplay egl_display; bool valid; bool display_bound; - bool flipperConnected; PFNEGLBINDWAYLANDDISPLAYWL egl_bind_wayland_display; PFNEGLUNBINDWAYLANDDISPLAYWL egl_unbind_wayland_display; PFNEGLQUERYWAYLANDBUFFERWL egl_query_wayland_buffer; @@ -212,20 +210,6 @@ bool WaylandEglClientBufferIntegration::isYInverted(struct ::wl_resource *buffer } -bool WaylandEglClientBufferIntegration::setDirectRenderSurface(QWaylandSurface *surface) -{ - Q_D(WaylandEglClientBufferIntegration); - - QPlatformScreen *screen = QPlatformScreen::platformScreenForWindow(m_compositor->window()); - QPlatformScreenPageFlipper *flipper = screen ? screen->pageFlipper() : 0; - if (flipper && !d->flipperConnected) { - QObject::connect(flipper, SIGNAL(bufferReleased(QPlatformScreenBuffer*)), m_compositor->handle(), SLOT(releaseBuffer(QPlatformScreenBuffer*))); - d->flipperConnected = true; - } - Q_UNUSED(surface); - return flipper; -} - void *WaylandEglClientBufferIntegration::lockNativeBuffer(struct ::wl_resource *buffer, QOpenGLContext *) const { Q_D(const WaylandEglClientBufferIntegration); diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h index a289baa0..94d31fc8 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h @@ -59,8 +59,6 @@ public: void bindTextureToBuffer(struct ::wl_resource *buffer) Q_DECL_OVERRIDE; bool isYInverted(struct ::wl_resource *) const Q_DECL_OVERRIDE; - bool setDirectRenderSurface(QWaylandSurface *) Q_DECL_OVERRIDE; - void *lockNativeBuffer(struct ::wl_resource *buffer, QOpenGLContext *context) const Q_DECL_OVERRIDE; void unlockNativeBuffer(void *native_buffer, QOpenGLContext *context) const Q_DECL_OVERRIDE; |