From 1dffceac360e07542902c0877332c7ad47f4f17d Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Tue, 15 Jan 2013 18:43:09 +0100 Subject: Fix build error in non wayland-egl backends MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7db31679d2fbc7f053e9eca53fdf2593dfe33f89 Reviewed-by: Giulio Camuffo Reviewed-by: Pier Luigi Fiorini Reviewed-by: Jørgen Lind --- .../platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglwindow.cpp | 2 +- .../wayland/gl_integration/readback_cgl/qwaylandreadbackcglwindow.cpp | 2 +- .../wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp | 2 +- .../wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp | 2 +- .../gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp | 2 +- .../gl_integration/xcomposite_glx/qwaylandxcompositeglxwindow.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglwindow.cpp b/src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglwindow.cpp index 82d66bb12..82f673922 100644 --- a/src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglwindow.cpp +++ b/src/plugins/platforms/wayland/gl_integration/brcm_egl/qwaylandbrcmeglwindow.cpp @@ -277,7 +277,7 @@ void QWaylandBrcmEglWindow::flushBuffers() m_mutex.lock(); while (!m_pending.isEmpty()) { QWaylandBrcmBuffer *buffer = m_pending.takeFirst(); - attach(buffer); + attach(buffer, 0, 0); damage(QRect(QPoint(), size)); } m_mutex.unlock(); diff --git a/src/plugins/platforms/wayland/gl_integration/readback_cgl/qwaylandreadbackcglwindow.cpp b/src/plugins/platforms/wayland/gl_integration/readback_cgl/qwaylandreadbackcglwindow.cpp index 14c8e64da..803b3b017 100644 --- a/src/plugins/platforms/wayland/gl_integration/readback_cgl/qwaylandreadbackcglwindow.cpp +++ b/src/plugins/platforms/wayland/gl_integration/readback_cgl/qwaylandreadbackcglwindow.cpp @@ -101,6 +101,6 @@ void QWaylandReadbackCGLWindow::createSurface() delete m_buffer; m_buffer = new QWaylandShmBuffer(m_CglIntegration->waylandDisplay(),size,QImage::Format_ARGB32); - attach(m_buffer); + attach(m_buffer, 0, 0); } diff --git a/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp b/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp index ff5ada891..7c288625e 100644 --- a/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp +++ b/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp @@ -160,7 +160,7 @@ void QWaylandReadbackEglContext::geometryChanged() XFreePixmap(mEglIntegration->xDisplay(),mPixmap); mBuffer = new QWaylandShmBuffer(mEglIntegration->waylandDisplay(),size,QImage::Format_ARGB32); - mWindow->attach(mBuffer); + mWindow->attach(mBuffer, 0, 0); mPixmap = XCreatePixmap(mEglIntegration->xDisplay(),mEglIntegration->rootWindow(),size.width(),size.height(),mEglIntegration->depth()); XSync(mEglIntegration->xDisplay(),False); diff --git a/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp b/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp index 11a73adcc..9ae771eb3 100644 --- a/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp +++ b/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp @@ -97,7 +97,7 @@ void QWaylandReadbackGlxWindow::createSurface() waitForFrameSync(); m_buffer = new QWaylandShmBuffer(m_glxIntegration->waylandDisplay(), size, QImage::Format_ARGB32); - attach(m_buffer); + attach(m_buffer, 0, 0); int depth = XDefaultDepth(m_glxIntegration->xDisplay(), m_glxIntegration->screen()); m_pixmap = XCreatePixmap(m_glxIntegration->xDisplay(), m_glxIntegration->rootWindow(), size.width(), size.height(), depth); diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp index 17dd6605c..0f50f63f1 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp @@ -131,7 +131,7 @@ void QWaylandXCompositeEGLWindow::createEglSurface() m_buffer = new QWaylandXCompositeBuffer(m_glxIntegration->waylandXComposite(), (uint32_t)m_xWindow, size); - attach(m_buffer); + attach(m_buffer, 0, 0); m_waitingForSync = true; struct wl_callback *callback = wl_display_sync(m_glxIntegration->waylandDisplay()->wl_display()); diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxwindow.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxwindow.cpp index 98d2e26b8..ad1916b3b 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxwindow.cpp +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxwindow.cpp @@ -133,7 +133,7 @@ void QWaylandXCompositeGLXWindow::createSurface() m_buffer = new QWaylandXCompositeBuffer(m_glxIntegration->waylandXComposite(), (uint32_t)m_xWindow, size); - attach(m_buffer); + attach(m_buffer, 0, 0); waitForSync(); } -- cgit v1.2.3