diff options
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgrendernode.cpp | 5 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgrendernode.h | 2 | ||||
| -rw-r--r-- | tests/auto/quick/rendernode/tst_rendernode.cpp | 17 |
3 files changed, 14 insertions, 10 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgrendernode.cpp b/src/quick/scenegraph/coreapi/qsgrendernode.cpp index 8dc82a0d66..6c61b35aa1 100644 --- a/src/quick/scenegraph/coreapi/qsgrendernode.cpp +++ b/src/quick/scenegraph/coreapi/qsgrendernode.cpp @@ -188,8 +188,6 @@ QSGRenderNode::StateFlags QSGRenderNode::changedStates() const */ /*! - \fn void QSGRenderNode::releaseResources() - This function is called when all custom graphics resources allocated by this node have to be freed immediately. In case the node does not directly allocate graphics resources (buffers, textures, render targets, fences, @@ -209,6 +207,9 @@ QSGRenderNode::StateFlags QSGRenderNode::changedStates() const With OpenGL, the scenegraph's OpenGL context will be current both when calling the destructor and this function. */ +void QSGRenderNode::releaseResources() +{ +} /*! \return pointer to the current model-view matrix. diff --git a/src/quick/scenegraph/coreapi/qsgrendernode.h b/src/quick/scenegraph/coreapi/qsgrendernode.h index 5441b64fe4..17569f8c59 100644 --- a/src/quick/scenegraph/coreapi/qsgrendernode.h +++ b/src/quick/scenegraph/coreapi/qsgrendernode.h @@ -76,7 +76,7 @@ public: virtual StateFlags changedStates() const; virtual void render(const RenderState *state) = 0; - virtual void releaseResources() = 0; + virtual void releaseResources(); const QMatrix4x4 *matrix() const; const QSGClipNode *clipList() const; diff --git a/tests/auto/quick/rendernode/tst_rendernode.cpp b/tests/auto/quick/rendernode/tst_rendernode.cpp index 782ebf5aee..313e5ac196 100644 --- a/tests/auto/quick/rendernode/tst_rendernode.cpp +++ b/tests/auto/quick/rendernode/tst_rendernode.cpp @@ -66,12 +66,12 @@ private slots: class ClearNode : public QSGRenderNode { public: - virtual StateFlags changedStates() + StateFlags changedStates() const override { return ColorState; } - virtual void render(const RenderState &) + void render(const RenderState *) override { // If clip has been set, scissoring will make sure the right area is cleared. QOpenGLContext::currentContext()->functions()->glClearColor(color.redF(), color.greenF(), color.blueF(), 1.0f); @@ -122,13 +122,13 @@ class MessUpNode : public QSGRenderNode, protected QOpenGLFunctions public: MessUpNode() : initialized(false) { } - virtual StateFlags changedStates() + StateFlags changedStates() const override { return StateFlags(DepthState) | StencilState | ScissorState | ColorState | BlendState - | CullState | ViewportState; + | CullState | ViewportState | RenderTargetState; } - virtual void render(const RenderState &) + void render(const RenderState *) override { if (!initialized) { initializeOpenGLFunctions(); @@ -152,6 +152,9 @@ public: glGetIntegerv(GL_FRONT_FACE, &frontFace); glFrontFace(frontFace == GL_CW ? GL_CCW : GL_CW); glEnable(GL_CULL_FACE); + GLuint fbo; + glGenFramebuffers(1, &fbo); + glBindFramebuffer(GL_FRAMEBUFFER, fbo); } bool initialized; @@ -257,8 +260,8 @@ void tst_rendernode::messUpState() class StateRecordingRenderNode : public QSGRenderNode { public: - StateFlags changedStates() { return StateFlags(-1); } - void render(const RenderState &) { + StateFlags changedStates() const override { return StateFlags(-1); } + void render(const RenderState *) override { matrices[name] = *matrix(); } |