summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Harju <mikko.harju@jolla.com>2013-08-19 11:15:25 +0300
committerAndy Nichols <andy.nichols@digia.com>2013-08-19 10:51:15 +0200
commit11b0a7db584d21eb7eb94849de79ad033249ae3c (patch)
treed5254da939a6ed49a050d90b68c7fe487cd369f4
parentefd4c0203cd15f7ec46b7165a333fdfb2bea9950 (diff)
Change setDirectRenderSurface to return the result
No need to hide the bool; it can be useful in compositors to check if direct rendering was properly activated. Change-Id: I4c12c9719aa6b7b5ec4a91602c5052b6841e1780 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
-rw-r--r--src/compositor/compositor_api/qwaylandcompositor.cpp4
-rw-r--r--src/compositor/compositor_api/qwaylandcompositor.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index 0f51c8415..c1300994d 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -124,9 +124,9 @@ QList<QWaylandSurface *> QWaylandCompositor::surfacesForClient(WaylandClient* c)
return result;
}
-void QWaylandCompositor::setDirectRenderSurface(QWaylandSurface *surface, QOpenGLContext *context)
+bool QWaylandCompositor::setDirectRenderSurface(QWaylandSurface *surface, QOpenGLContext *context)
{
- m_compositor->setDirectRenderSurface(surface ? surface->handle() : 0, context);
+ return m_compositor->setDirectRenderSurface(surface ? surface->handle() : 0, context);
}
QWaylandSurface *QWaylandCompositor::directRenderSurface() const
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index 0f258617e..cd1f9bd38 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -75,7 +75,7 @@ public:
QList<QWaylandSurface *> surfacesForClient(WaylandClient* client) const;
- void setDirectRenderSurface(QWaylandSurface *surface, QOpenGLContext *context);
+ bool setDirectRenderSurface(QWaylandSurface *surface, QOpenGLContext *context);
QWaylandSurface *directRenderSurface() const;
QWindow *window()const;