diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2014-01-06 16:07:18 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-06 16:08:21 +0100 |
| commit | fc75b3090a5b957afa1b64ca949fb96603b285be (patch) | |
| tree | 9e5a648a3a31b095aa1da185f20d48955b9618f1 /examples | |
| parent | 2fa224efd44445f3e87cb9471fd4b9269d5ffc0d (diff) | |
Compile fixes for example compositors
Change-Id: I4399681dc91ca20a84177247379cf6eafd2b6a6e
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qwidget-compositor/main.cpp | 4 | ||||
| -rw-r--r-- | examples/server-buffer/compositor/main.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/examples/qwidget-compositor/main.cpp b/examples/qwidget-compositor/main.cpp index b9d936f3d..2c58fe98d 100644 --- a/examples/qwidget-compositor/main.cpp +++ b/examples/qwidget-compositor/main.cpp @@ -147,7 +147,7 @@ protected: if (surface->type() == QWaylandSurface::Shm) { texture = m_textureCache->bindTexture(context()->contextHandle(), surface->image()); } else { - texture = surface->texture(QOpenGLContext::currentContext()); + texture = surface->texture(); } functions->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, @@ -173,7 +173,7 @@ protected: if (size.isValid()) { GLuint texture = 0; if (subSurface->type() == QWaylandSurface::Texture) { - texture = subSurface->texture(QOpenGLContext::currentContext()); + texture = subSurface->texture(); } else if (surface->type() == QWaylandSurface::Shm ) { texture = m_textureCache->bindTexture(context()->contextHandle(), surface->image()); } diff --git a/examples/server-buffer/compositor/main.cpp b/examples/server-buffer/compositor/main.cpp index e6057cdd0..5e1f014b8 100644 --- a/examples/server-buffer/compositor/main.cpp +++ b/examples/server-buffer/compositor/main.cpp @@ -46,6 +46,7 @@ #include <QTimer> #include <QPainter> #include <QMouseEvent> +#include <QOpenGLContext> #include <QQmlContext> |