summaryrefslogtreecommitdiffstats
path: root/src/core/delegated_frame_node.h
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-07-07 18:21:52 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-06 19:07:45 +0200
commitfffb6233a366a92336aeed690cae0b704358511d (patch)
treed7ee82c5dfc696151aba1e2f134c1b350f15de1c /src/core/delegated_frame_node.h
parent83a6c1b92f38b4b0bdb3f90d67be7bb1e4caef7a (diff)
Use QSGEngine instead of the private QSGRenderContext
QSGEngine was added in Qt 5.4 to allow using the scene graph without QQuickWindow. Use it for our FBO as well as for the QOpenGLWidget rendering. Change-Id: If4665d4f33c9dad69d2d4269309163bb5ffbd8e3 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/delegated_frame_node.h')
-rw-r--r--src/core/delegated_frame_node.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/core/delegated_frame_node.h b/src/core/delegated_frame_node.h
index a42e293a5..617e16f6b 100644
--- a/src/core/delegated_frame_node.h
+++ b/src/core/delegated_frame_node.h
@@ -52,10 +52,6 @@
#include "chromium_gpu_helper.h"
-QT_BEGIN_NAMESPACE
-class QSGRenderContext;
-QT_END_NAMESPACE
-
namespace cc {
class DelegatedFrameData;
}
@@ -75,14 +71,13 @@ public:
class DelegatedFrameNode : public QSGTransformNode {
public:
- DelegatedFrameNode(QSGRenderContext *sgRenderContext);
+ DelegatedFrameNode();
~DelegatedFrameNode();
void preprocess();
void commit(DelegatedFrameNodeData* data, cc::ReturnedResourceArray *resourcesToRelease);
private:
QExplicitlySharedDataPointer<DelegatedFrameNodeData> m_data;
- QSGRenderContext *m_sgRenderContext;
QList<QSharedPointer<RenderPassTexture> > m_renderPassTextures;
int m_numPendingSyncPoints;
FenceSync m_mailboxesGLFence;