summaryrefslogtreecommitdiffstats
path: root/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'examples/wayland/qwindow-compositor/qwindowcompositor.cpp')
-rw-r--r--examples/wayland/qwindow-compositor/qwindowcompositor.cpp17
1 files changed, 1 insertions, 16 deletions
diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
index 5d338692f..6663a04d0 100644
--- a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
+++ b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
@@ -118,7 +118,7 @@ public:
};
QWindowCompositor::QWindowCompositor(CompositorWindow *window)
- : QWaylandCompositor(0, DefaultExtensions | SubSurfaceExtension)
+ : QWaylandCompositor(0, DefaultExtensions)
, m_window(window)
, m_backgroundTexture(0)
, m_textureBlitter(0)
@@ -340,9 +340,6 @@ void QWindowCompositor::render()
foreach (QWaylandSurfaceView *view, surface->views()) {
QRect geo(view->pos().toPoint(),surface->size());
m_textureBlitter->drawTexture(texture,geo,m_window->size(),0,false,surface->isYInverted());
- foreach (QWaylandSurface *child, surface->subSurfaces()) {
- drawSubSurface(view->pos().toPoint(), child);
- }
}
}
@@ -353,18 +350,6 @@ void QWindowCompositor::render()
m_window->swapBuffers();
}
-void QWindowCompositor::drawSubSurface(const QPoint &offset, QWaylandSurface *surface)
-{
- GLuint texture = static_cast<BufferAttacher *>(surface->bufferAttacher())->texture;
- QWaylandSurfaceView *view = surface->views().first();
- QPoint pos = view->pos().toPoint() + offset;
- QRect geo(pos, surface->size());
- m_textureBlitter->drawTexture(texture, geo, m_window->size(), 0, false, surface->isYInverted());
- foreach (QWaylandSurface *child, surface->subSurfaces()) {
- drawSubSurface(pos, child);
- }
-}
-
bool QWindowCompositor::eventFilter(QObject *obj, QEvent *event)
{
if (obj != m_window)