diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-04 10:34:08 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-05 10:46:12 +0200 |
commit | 8f3b218099d9f1d9aa4ae58474430f864a8758ef (patch) | |
tree | f48d70803a3b9e5fe3c4f879d8b90a5919f8fde4 /src/declarative/items/qsgcanvas_p.h | |
parent | a61337b33ae1a3ee2df1570da30880e8fe9237e9 (diff) |
Make QSGCanvas a QWindow instead of a QGLWidget
Change-Id: I71a04f61acff893a35c00204ed11bdf852830485
Reviewed-on: http://codereview.qt.nokia.com/2675
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/declarative/items/qsgcanvas_p.h')
-rw-r--r-- | src/declarative/items/qsgcanvas_p.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/declarative/items/qsgcanvas_p.h b/src/declarative/items/qsgcanvas_p.h index 20fc332e1b..b147bb3325 100644 --- a/src/declarative/items/qsgcanvas_p.h +++ b/src/declarative/items/qsgcanvas_p.h @@ -64,7 +64,9 @@ #include <QtCore/qmutex.h> #include <QtCore/qwaitcondition.h> #include <private/qwidget_p.h> +#include <private/qwindow_p.h> #include <private/qgl_p.h> +#include <qguiglcontext_qpa.h> #include <QtOpenGL/qglframebufferobject.h> QT_BEGIN_NAMESPACE @@ -82,7 +84,7 @@ class QSGCanvasPrivate; class QTouchEvent; class QSGCanvasRenderThread; -class QSGCanvasPrivate : public QGLWidgetPrivate +class QSGCanvasPrivate : public QWindowPrivate { public: Q_DECLARE_PUBLIC(QSGCanvas) @@ -156,8 +158,6 @@ public: QSGContext *context; - uint contextFailed : 1; - uint threadedRendering : 1; uint animationRunning: 1; uint renderThreadAwakened : 1; @@ -182,6 +182,8 @@ class QSGCanvasRenderThread : public QThread public: QSGCanvasRenderThread() : mutex(QMutex::NonRecursive) + , guiContext(0) + , glContext(0) , isGuiBlocked(0) , isPaintCompleted(false) , isGuiBlockPending(false) @@ -225,6 +227,9 @@ public: QSGCanvas *renderer; QSGCanvasPrivate *d; + QGuiGLContext *guiContext; + QGLContext *glContext; + int isGuiBlocked; uint isPaintCompleted : 1; uint isGuiBlockPending : 1; |