Enable threaded/immediate rendering for FBO(step 1)

1. Create a new gl context if the scenegraph render thread is different with context2d render thread
2. Expose the gl context and window surface from context2d
3. Get the right current gl context before painting

Change-Id: I5e252a8142d760442f9dfb53ed8a8ce289379af9
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h
index 409c165b79..22addf33a8 100644
--- a/src/quick/items/context2d/qquickcontext2d_p.h
+++ b/src/quick/items/context2d/qquickcontext2d_p.h
@@ -70,7 +70,9 @@ class QQuickContext2DCommandBuffer;
 class QQuickContext2DTexture;
 class QQuickPixmap;
 class QSGTexture;
-
+class QQuickWindowManager;
+class QSurface;
+class QOpenGLContext;
 
 class QQuickContext2D : public QQuickCanvasContext
 {
@@ -223,6 +225,9 @@ public:
     QPainterPath createTextGlyphs(qreal x, qreal y, const QString& text);
     QImage createImage(const QUrl& url);
 
+    QOpenGLContext *glContext() { return m_glContext; }
+    QSurface *surface() { return m_surface; }
+
     State state;
     QStack<QQuickContext2D::State> m_stateStack;
     QQuickCanvasItem* m_canvas;
@@ -232,6 +237,9 @@ public:
     v8::Local<v8::Value> m_strokeStyle;
     v8::Handle<v8::Value> m_v8path;
     QV8Engine *m_v8engine;
+    QQuickWindowManager *m_windowManager;
+    QSurface *m_surface;
+    QOpenGLContext *m_glContext;
     v8::Persistent<v8::Object> m_v8value;
     QQuickContext2DTexture *m_texture;
     QQuickCanvasItem::RenderTarget m_renderTarget;