diff options
| author | Robin Burchell <robin.burchell@jollamobile.com> | 2013-10-15 17:05:29 +0000 |
|---|---|---|
| committer | Robin Burchell <robin+qt@viroteck.net> | 2013-10-17 12:24:30 +0200 |
| commit | 569be504f68fb6e6796145c29b951b97bd24c20e (patch) | |
| tree | 1dea91bf9ee18065bb4007fbfb4bbd496012ace1 /src/plugins/waylandcompositors | |
| parent | d2b9d5e9cfa7b18902d1211e0541fdf4787aa0ed (diff) | |
| download | qtwayland-569be504f68fb6e6796145c29b951b97bd24c20e.tar.gz | |
Remove code for EGL_WL_request_client_buffer_format.
This appears to have no supported use in the open source or modern world, so
drop the dead code.
Change-Id: Ic08a6bf2c844da567e8f76cec7201ee31ded5b81
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/plugins/waylandcompositors')
| -rw-r--r-- | src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp index abf12fad..1f5b5722 100644 --- a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp +++ b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp @@ -94,9 +94,6 @@ public: bool valid; bool display_bound; bool flipperConnected; -#ifdef EGL_WL_request_client_buffer_format - QPointer<WaylandSurface> directRenderSurface; -#endif PFNEGLBINDWAYLANDDISPLAYWL egl_bind_wayland_display; PFNEGLUNBINDWAYLANDDISPLAYWL egl_unbind_wayland_display; PFNEGLQUERYWAYLANDBUFFERWL egl_query_wayland_buffer; @@ -207,11 +204,7 @@ GLuint WaylandEglIntegration::createTextureFromBuffer(struct ::wl_resource *buff bool WaylandEglIntegration::isYInverted(struct ::wl_resource *buffer) const { -#ifdef EGL_WL_request_client_buffer_format - return eglGetBufferYInvertedWL(buffer); -#else return QWaylandGraphicsHardwareIntegration::isYInverted(buffer); -#endif } @@ -225,22 +218,7 @@ bool WaylandEglIntegration::setDirectRenderSurface(QWaylandSurface *surface) QObject::connect(flipper, SIGNAL(bufferReleased(QPlatformScreenBuffer*)), m_compositor->handle(), SLOT(releaseBuffer(QPlatformScreenBuffer*))); d->flipperConnected = true; } -#ifdef EGL_WL_request_client_buffer_format - int buffer_format = surface ? EGL_SCANOUT_FORMAT_WL : EGL_RENDER_FORMAT_WL; - struct wl_client *client = 0; - if (surface) { - client = surface->handle()->base()->resource.client; - } else { - WaylandSurface *oldSurface = d->directRenderSurface.data(); - if (oldSurface) - client = oldSurface->handle()->base()->resource.client; - } - if (client) - eglRequestClientBufferFormatWL(d->egl_display, client, buffer_format); - d->directRenderSurface = surface; -#else Q_UNUSED(surface); -#endif return flipper; } |