Revert QSGRenderNode to the old "in context" behavior

There is already a lot of code out there that makes use
of the rendernode hook and some of it is not capable
of dealing with the render target being something other
than 0. (Mozilla in this case).

By forcing everything into the "alpha" code path, the
hit on the renderer should be fairly minimal as long as
render nodes are kept to a minimum, so reverting back
to the ugly old behavior is acceptable.

The API is still internal and highly discouraged.

Change-Id: Ie35484f52da6b0420257c95710fdda07a2be2c23
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
index a0fa96f989..0aa84da185 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
@@ -194,15 +194,11 @@ struct RenderNodeElement : public Element {
     RenderNodeElement(QSGRenderNode *rn)
         : Element(0)
         , renderNode(rn)
-        , fbo(0)
     {
         isRenderNode = true;
     }
 
-    ~RenderNodeElement();
-
     QSGRenderNode *renderNode;
-    QOpenGLFramebufferObject *fbo;
 };
 
 struct BatchRootInfo {
@@ -436,7 +432,6 @@ private:
     void renderUnmergedBatch(const Batch *batch);
     void updateClip(const QSGClipNode *clipList, const Batch *batch);
     const QMatrix4x4 &matrixForRoot(Node *node);
-    void prepareRenderNode(RenderNodeElement *e);
     void renderRenderNode(Batch *batch);
     void setActiveShader(QSGMaterialShader *program, ShaderManager::Shader *shader);
 
@@ -485,6 +480,7 @@ private:
     QSGMaterialShader *m_currentProgram;
     ShaderManager::Shader *m_currentShader;
     const QSGClipNode *m_currentClip;
+    ClipType m_currentClipType;
 
     // For minimal OpenGL core profile support
     QOpenGLVertexArrayObject *m_vao;